[SM-Commit] GIT changes to master grimoire by Arjan Bouter (bae75c634b6d0d05b0da378a70e3681f05ee6976)

Arjan Bouter scm at mail.sourcemage.org
Tue Oct 3 10:21:25 EDT 2006


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 display/directfb/DETAILS |    6 +++---
 display/directfb/HISTORY |    4 ++++
 display/qingy/BUILD      |    1 +
 display/qingy/CONFIGURE  |    4 +---
 display/qingy/DEPENDS    |    7 ++++++-
 display/qingy/DETAILS    |    4 ++--
 display/qingy/HISTORY    |    5 +++++
 display/qingy/PRE_BUILD  |    4 +---
 8 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit bae75c634b6d0d05b0da378a70e3681f05ee6976
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    qingy: added some crypto options and version bump to 0.9.1

commit f7e6c9f524c60a2026819c6b781db1de27902050
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    directfb: version bump

diff --git a/display/directfb/DETAILS b/display/directfb/DETAILS
index 85ca16c..2e95a8b 100755
--- a/display/directfb/DETAILS
+++ b/display/directfb/DETAILS
@@ -1,9 +1,9 @@
            SPELL=directfb
-         VERSION=0.9.25.1
+         VERSION=1.0.0-rc1
           SOURCE=DirectFB-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DirectFB-$VERSION
-   SOURCE_URL[0]=http://www.directfb.org/download/DirectFB/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+   SOURCE_URL[0]=http://www.directfb.org/downloads/Core/$SOURCE
+      SOURCE_HASH=sha512:1fb193764bbe76f9d236b47bdffc700b57bfb612f5d68d01a4133bca2d4582a3aa10cfd56a645c04ba0fc095bfcd952ab31af6ce051bff7ca87cbe161589ad6d
       LICENSE[0]=LGPL
         KEYWORDS="display"
         WEB_SITE=http://www.directfb.org/
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index 42a96d0..983706e 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,7 @@
+2006-10-03 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.0.0-rc1
+	  updated download url to match website
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/display/qingy/BUILD b/display/qingy/BUILD
index 6c7ac5f..df530ce 100755
--- a/display/qingy/BUILD
+++ b/display/qingy/BUILD
@@ -3,6 +3,7 @@ OPTS="--with-themes-dir=/etc/qingy/theme
       $QINGY_CRYPTO_OPTION                 \
       $QINGY_OPTIMIZATIONS                 \
       $QINGY_STATIC                        \
+      --enable-crypto=$QINGY_CRYPTO        \
       $OPTS"                               &&
 
 default_build
diff --git a/display/qingy/CONFIGURE b/display/qingy/CONFIGURE
index 035ba3d..6248837 100755
--- a/display/qingy/CONFIGURE
+++ b/display/qingy/CONFIGURE
@@ -3,9 +3,7 @@ config_query  QINGY_XINIT  'Allow X serv
 config_query_option  QINGY_SCREENSAVERS  'Enable screen savers?'          y  \
                      '--enable-screen-savers'  '--disable-screen-savers'     &&
 
-config_query_option  QINGY_CRYPTO_OPTION                             \
-  'encrypt communications between qingy and its user interface?'  y  \
-  '--enable-crypto'  '--disable-crypto'
+config_query_list QINGY_CRYPTO 'Which library do you prefer to encrypt internal communication?' openssl libgcrypt none
 
 config_query_option  QINGY_OPTIMIZATIONS  'Enable optimizations?'         y  \
                      '--enable-optimizations'  '--disable-optimizations'     &&
diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS
index bdcbef0..8d96854 100755
--- a/display/qingy/DEPENDS
+++ b/display/qingy/DEPENDS
@@ -1,4 +1,9 @@
-depends  openssl   &&
+if [[ "$QINGY_CRYPTO" == 'openssl' ]]; then
+  depends openssl
+elif  [[ "QINGY_CRYPTO" == 'libgcrypt' ]]; then
+  depends libgcrypt
+fi  &&
+
 depends  directfb  &&
 
 optional_depends  X11-SERVER         \
diff --git a/display/qingy/DETAILS b/display/qingy/DETAILS
index 092c352..bed7d37 100755
--- a/display/qingy/DETAILS
+++ b/display/qingy/DETAILS
@@ -1,9 +1,9 @@
            SPELL=qingy
-         VERSION=0.6.0
+         VERSION=0.9.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:dbb767dac9f0af5317e123a6a70d262d8bb2bfc005891ad26e2b231045c95e4b0dc588b1dda46478ac2a2676cc96d718a56ba398ed7f2883280e6b2732a8bf55
+     SOURCE_HASH=sha512:e74de5e8a49a2c1f9d5bfd1d83d837fae9fcd6372d5905f2d07cea85f13fea90325f52cac8cecd7538df80b0ebc7fe8af3d596c6372886af4dbfa40707f2b1ca
         WEB_SITE=http://qingy.sourceforge.net
          ENTERED=20040913
       PATCHLEVEL=1
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 64e6f83..43eac25 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,8 @@
+2006-10-03 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: 0.9.1
+	* DEPENDS, CONFIGURE: offer a choice for internal crypto
+	* PRE_BUILD: use is_depends_enabled instead of custom voodoo
+
 2006-08-15 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED (deprecated in favor of 
 	  PATCHLEVEL).
diff --git a/display/qingy/PRE_BUILD b/display/qingy/PRE_BUILD
index 92c1e0a..e7bfa7e 100755
--- a/display/qingy/PRE_BUILD
+++ b/display/qingy/PRE_BUILD
@@ -1,9 +1,7 @@
 default_pre_build                                                      &&
-patch  $SOURCE_DIRECTORY/media/Makefile.in                             \
-       $SCRIPT_DIRECTORY/config.patch                                  &&
 cd ${SOURCE_DIRECTORY}                                                 &&
 patch  -p1  <  $SCRIPT_DIRECTORY/shutdown.patch                        &&
-if ! ( echo $OPTS | grep -q "enable-emacs" ); then
+if ! ( is_depends_enabled emacs ); then
   rm  media/sessions/emacs                                             &&
   sedit "s/emacs//" media/sessions/Makefile.am                         &&
   sedit "s/emacs//" media/sessions/Makefile.in



More information about the SM-Commit mailing list