[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (65467001e1707649fa7d202919230600566380d9)

Treeve Jelbert scm at mail.sourcemage.org
Tue Mar 6 11:40:09 EST 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 utils/avahi/DETAILS         |    5 ++---
 utils/avahi/HISTORY         |    5 +++++
 utils/avahi/PRE_SUB_DEPENDS |    2 ++
 utils/avahi/SUB_DEPENDS     |    6 ++++++
 utils/avahi/qt.patch        |   17 +++++++++++++----
 5 files changed, 28 insertions(+), 7 deletions(-)

New commits:
commit 1a972db21ca1b848e5fead321c8a6f8703ef0fc1
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    avahi-0.6.17

diff --git a/utils/avahi/DETAILS b/utils/avahi/DETAILS
index fbf68b2..ca0991e 100755
--- a/utils/avahi/DETAILS
+++ b/utils/avahi/DETAILS
@@ -1,9 +1,8 @@
            SPELL=avahi
-         VERSION=0.6.16
-     SOURCE_HASH=sha512:3611caa81813017e54347674f5070432c012d6d12e8cf4e618ca4fc79080ce5fdccb57674fc44918098060087eb83043ecfe7d49bc999eddf1e8f0b4f7c715fb
+         VERSION=0.6.17
+     SOURCE_HASH=sha512:dddbc1a932618cd387be99f0bfa9908e8dbb2d1dcd40b092fd4cca4387e5fd46fcff58fbe165adefbd7f3b845073a1f2c2cb35537809a14caf2467d05564dbf2
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-#      SOURCE_URL=http://lathiat.net/${SOURCE}
       SOURCE_URL=http://avahi.org/download/${SOURCE}
         WEB_SITE=http://avahi.org/
          ENTERED=20060626
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 3312a78..53e5093 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,8 @@
+2007-03-06 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 0.6.17
+	* qt.patch: update to also detect qt4
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: add QT3, QT4 options
+
 2007-01-11 Treeve Jelbert <treeve at pi.be>
 	* PRE_BUILD: remove only dbus.patch
 	* dbus.patch: delete
diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS
index f827222..06b31b3 100755
--- a/utils/avahi/PRE_SUB_DEPENDS
+++ b/utils/avahi/PRE_SUB_DEPENDS
@@ -1,4 +1,6 @@
 case $THIS_SUB_DEPENDS in
   MONO)  if is_depends_enabled $SPELL mono; then return 0; fi;;
+  QT3)   if is_depends_enabled $SPELL qt-x11; then return 0; fi;;
+  QT4)   if is_depends_enabled $SPELL qt4; then return 0; fi;;
 esac  &&
 return 1
diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS
index e75c488..a4e7d38 100755
--- a/utils/avahi/SUB_DEPENDS
+++ b/utils/avahi/SUB_DEPENDS
@@ -2,5 +2,11 @@ case $THIS_SUB_DEPENDS in
 MONO) echo "mono bindings requested, forcing them."  &&
         depends  mono  '--enable-mono'
         ;;
+QT3)  echo "qt3 bindings requested, forcing them."  &&
+        depends  qt-x11  '--enable-qt3'
+        ;;
+QT4)  echo "qt4 bindings requested, forcing them."  &&
+        depends  qt4  '--enable-qt4'
+        ;;
    *) echo "unknown sub-depends!"; return 1;;
 esac
diff --git a/utils/avahi/qt.patch b/utils/avahi/qt.patch
index 5024a0c..3295a34 100644
--- a/utils/avahi/qt.patch
+++ b/utils/avahi/qt.patch
@@ -1,7 +1,7 @@
-diff -uNr avahi-0.6.12/configure.ac avahi-0.6.12.cp/configure.ac
---- avahi-0.6.12/configure.ac	2006-07-22 14:39:40.000000000 +0200
-+++ avahi-0.6.12.cp/configure.ac	2006-07-24 15:13:36.000000000 +0200
-@@ -315,7 +315,7 @@
+diff -uNr avahi-0.6.17/configure.ac avahi-0.6.17.cp/configure.ac
+--- avahi-0.6.17/configure.ac	2007-01-05 23:43:43.000000000 +0100
++++ avahi-0.6.17.cp/configure.ac	2007-03-06 17:11:45.000000000 +0100
+@@ -343,7 +343,7 @@
  	    QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
          MOC_QT3="no"
  	    AC_CHECK_FILE( "$QT3_PREFIX/moc-qt3", [ MOC_QT3=$QT3_PREFIX/moc-qt3 ], [
@@ -10,3 +10,12 @@ diff -uNr avahi-0.6.12/configure.ac avah
                  AC_MSG_ERROR([Couldn't find QT3 moc])])])
          AC_SUBST(MOC_QT3)
  fi
+@@ -368,7 +368,7 @@
+ 	    QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
+         MOC_QT4="no"
+ 	    AC_CHECK_FILE( "$QT4_PREFIX/moc-qt4", [ MOC_QT4=$QT4_PREFIX/moc-qt4 ], [
+-               AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc ], [ 
++       	       AC_CHECK_FILE("/usr/bin/qt4/moc", [ MOC_QT4=/usr/bin/qt4/moc ], [ 
+                AC_MSG_ERROR([Couldn't find QT4 moc])])])
+         AC_SUBST(MOC_QT4)
+ fi



More information about the SM-Commit mailing list