[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (826e1545573f8e466309ebfc790b9e3df10d10a5)

Treeve Jelbert scm at sourcemage.org
Tue Mar 9 04:45:57 EST 2010


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 crypto/pinentry/BUILD      |    7 ++++---
 crypto/pinentry/DEPENDS    |    3 ++-
 crypto/pinentry/DETAILS    |    4 ++--
 crypto/pinentry/HISTORY    |    5 +++++
 kde4/kdevelop4/DETAILS     |    4 ++--
 kde4/kdevelop4/HISTORY     |    3 +++
 kde4/kdevplatform4/DETAILS |    6 +++---
 kde4/kdevplatform4/HISTORY |    3 +++
 8 files changed, 24 insertions(+), 11 deletions(-)

New commits:
commit 826e1545573f8e466309ebfc790b9e3df10d10a5
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdevelop4: => 3.9.99

commit df1f89ce3522f271cd43e6d12312a7c0d02facfb
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdevplatform4: => 0.9.99

commit e963889810ec7fa2451eeb8cdfd7a42ec16247f5
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pinentry: => 0.8.0

diff --git a/crypto/pinentry/BUILD b/crypto/pinentry/BUILD
index c8bdb94..3ffd5f2 100755
--- a/crypto/pinentry/BUILD
+++ b/crypto/pinentry/BUILD
@@ -1,9 +1,10 @@
 # fix bad moc files
 if is_depends_enabled $SPELL qt4;then
-  MOC=/usr/bin/qt4/moc &&
+  QTDIR=/usr/bin/qt4 &&
+  PATH=$QTDIR:$PATH  &&
   cd qt4  &&
-  $MOC pinentrydialog.h > pinentrydialog.moc   &&
-  $MOC qsecurelineedit.h > qsecurelineedit.moc &&
+  moc pinentrydialog.h > pinentrydialog.moc   &&
+  moc qsecurelineedit.h > qsecurelineedit.moc &&
   cd ..
 fi  &&
 OPTS="$OPTS $PINENTRY_CURSES"  &&
diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index eef7e76..f8bda32 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -1,3 +1,4 @@
+depends pkgconfig &&
 optional_depends gtk+                       \
                  ""                         \
                  "--disable-pinentry-gtk"   \
@@ -14,6 +15,6 @@ optional_depends qt-x11                                                     \
                  "to build Qt pinentry"                                     &&
 
 optional_depends qt4                                                         \
-                 "--with-qt-includes=/usr/include/Qt --enable-pinentry-qt4"  \
+                 "--enable-pinentry-qt4"  \
                  "--disable-pinentry-qt4"                                    \
                  "to build Qt4 pinentry"
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index dc08543..7ae3eaa 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pinentry
-         VERSION=0.7.6
+         VERSION=0.8.0
+     SOURCE_HASH=sha512:2c850f060e7d65a7d4cc19d1fb3b0eed97e1e1f091098a1278a66d9338494f15d07c1ef851fbbfa66ec26e0886675af3941b991c926bb23bc7672e440075d568
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
-     SOURCE_HASH=sha512:86dedb45f33c17485307dba7c79e854bdd4f2d18e703f0bb209cffcf3ee7bc98d7f415db65b8ac6c088e10ace406026f1cceac119d12e65db2ca841ce4cbb5fa
         WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html
          ENTERED=20030326
       LICENSE[0]=GPL
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index a143d80..ed8623d 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,8 @@
+2010-03-07 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.0
+	* DEPENDS: add pkgconfig
+	* BUILD: add QTDIR to PATH
+
 2009-09-03 Treeve Jelbert <treeve at sourcemage.org>
 	* BUILD: fix bad moc files for qt4
 
diff --git a/kde4/kdevelop4/DETAILS b/kde4/kdevelop4/DETAILS
index e4185d8..4311bf1 100755
--- a/kde4/kdevelop4/DETAILS
+++ b/kde4/kdevelop4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdevelop4
           SPELLX=${SPELL//4}
-         VERSION=3.9.98
-     SOURCE_HASH=sha512:4ebb67b1a444cc314fd2254b895e5d34b14c367e0462ccdba3fbcb8b7d39e4219d4d4e52da82a5e2c2cd9ef5efac2c62bc43125531f8eac86af14b4573d35094
+         VERSION=3.9.99
+     SOURCE_HASH=sha512:9b669703ec0a2d5d2da6935957e55847ead342fa58b46195d1959c4c8fc5078b93257b02a24b2dc0a2d48e457c4247d4d36ed9ca01c9e409683ba7601fcae2d9
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/unstable/$SPELLX/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevelop4/HISTORY b/kde4/kdevelop4/HISTORY
index 52790d0..3b5a3e6 100644
--- a/kde4/kdevelop4/HISTORY
+++ b/kde4/kdevelop4/HISTORY
@@ -1,3 +1,6 @@
+2010-03-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.9.99
+
 2010-02-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.9.98
 
diff --git a/kde4/kdevplatform4/DETAILS b/kde4/kdevplatform4/DETAILS
index e085655..09013a2 100755
--- a/kde4/kdevplatform4/DETAILS
+++ b/kde4/kdevplatform4/DETAILS
@@ -1,8 +1,8 @@
            SPELL=kdevplatform4
           SPELLX=${SPELL//4}
-         VERSION=0.9.98
-              VX=3.9.98
-     SOURCE_HASH=sha512:e406d68ddf61e7bc9f8bf3115a1a038d1cca6924417673e66ad64682c7db5ce906066581dc2c0ac49f771f439be906b697503bef0090612cd2a8c11de8bf5069
+         VERSION=0.9.99
+              VX=3.9.99
+     SOURCE_HASH=sha512:3c2d2ad0c2fa5b7955712f7e2f4e0393d46ced22a46c9eac45d81cb9f372c4446304f053cbae7e649de7ddc6c1de22b8028ddc515238b4520f647c4dda9f605e
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/unstable/kdevelop/$VX/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevplatform4/HISTORY b/kde4/kdevplatform4/HISTORY
index 905e9d5..dd106f1 100644
--- a/kde4/kdevplatform4/HISTORY
+++ b/kde4/kdevplatform4/HISTORY
@@ -1,3 +1,6 @@
+2010-03-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: 0.9.99
+
 2010-02-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: 0.9.98
 	* PRE_BUILD: deleted



More information about the SM-Commit mailing list