Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (46506487785030410f2f4d560bced028aaedc911)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (46506487785030410f2f4d560bced028aaedc911)
  • Date: Thu, 14 Jun 2012 16:50:25 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

utils/avahi/BUILD | 11 +++++++++--
utils/avahi/DEPENDS | 8 +++-----
utils/avahi/HISTORY | 11 +++++++++++
utils/avahi/PRE_BUILD | 1 -
utils/avahi/qt.patch | 40 ++++++++++++++++++++--------------------
5 files changed, 43 insertions(+), 28 deletions(-)

New commits:
commit 46506487785030410f2f4d560bced028aaedc911
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

avahi: Do not run autoreconf as it seems to break install
Changed qt.patch to patch configure rather than configure.ac so
autoreconf does not need to be run.

BUILD: Setting variables in DEPENDS isn't persistent, so change check for
no D-BUS.
Explicitly disable pygtk annd gdbm if not enabled
DEPENDS: if glib is disabled, disable gobject as well.
Remove setting AVAHI_NODBUS as it is not persistent.
Set disable gdbm flag in BUILD.

diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index ddb918a..efaf029 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -9,7 +9,7 @@ if [[ "$AVAHI_DAEMON" == 'n' ]]; then
OPTS="${OPTS} --with-xml=none"
fi &&

-if [[ "$AVAHI_NODBUS" == 'y' ]]; then
+if ! is_depends_enabled $SPELL dbus; then
OPTS="${OPTS} --disable-dbus"
fi &&

@@ -21,7 +21,14 @@ if [[ "$AVAHI_COMPAT_HOWL" == 'y' ]]; then
OPTS="$OPTS --enable-compat-howl"
fi &&

-OPTS="--disable-qt3 $OPTS" &&
+if ! is_depends_enabled $SPELL pygtk2; then
+ OPTS="$OPTS --disable-pygtk"
+fi &&

+if ! is_depends_enabled $SPELL gdbm; then
+ OPTS="$OPTS --disable-gdbm"
+fi &&
+
+OPTS="--disable-qt3 $OPTS" &&

default_build
diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 8947f1b..b2eb27d 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -16,7 +16,7 @@ optional_depends gtk+3 \
"Use GTK+3?" &&

optional_depends glib2 \
- "--enable-glib" "--disable-glib" \
+ "--enable-glib" "--disable-glib --disable-gobject" \
"Enable glib bindings?" &&

if ( is_depends_enabled $SPELL qt4 ) || \
@@ -37,11 +37,8 @@ depends libdaemon --enable-libdaemon &&
if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_DAEMON" == 'y' ]] || \
[[ "$AVAHI_CLIENT" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
depends dbus --enable-dbus
-else
- AVAHI_NODBUS=y
fi &&

-
if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
depends dbus-python '--enable-dbus' &&
depends pygtk2 '--enable-pygtk'
@@ -52,7 +49,8 @@ if [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
fi &&

if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_UTILS" == 'y' ]]; then
- optional_depends gdbm "--enable-gdbm" "--disable-gdbm" "Use GDBM?"
+ # disabled in build if not enabled
+ optional_depends gdbm "--enable-gdbm" "" "Use GDBM?"
fi &&

if [[ "$AVAHI_DISCOVER" == 'y' ]] && ( is_depends_enabled $SPELL gdbm ); then
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index b3e670d..d5ad365 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,14 @@
+2012-06-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: Setting variables in DEPENDS isn't persistent, so change
+ check for no D-BUS.
+ Explicitly disable pygtk annd gdbm if not enabled
+ * DEPENDS: if glib is disabled, disable gobject as well.
+ Remove setting AVAHI_NODBUS as it is not persistent.
+ Set disable gdbm flag in BUILD.
+ * PRE_BUILD: Do not run autoreconf as it seems to break install
+ * qt.patch: Changed. Lets patch configure rather than configure.ac
+ so autoreconf does not need to be run.
+
2012-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.31
* INSTALL: added
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index 493a8f6..d14e782 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
patch -p1 < $SPELL_DIRECTORY/qt.patch &&
-autoreconf &&
create_group netdev &&
create_group avahi &&
create_account avahi &&
diff --git a/utils/avahi/qt.patch b/utils/avahi/qt.patch
index ebeecc6..d02a2f2 100644
--- a/utils/avahi/qt.patch
+++ b/utils/avahi/qt.patch
@@ -1,20 +1,20 @@
---- avahi-0.6.23/configure.ac 2008-07-20 18:38:46.000000000 +0200
-+++ avahi-0.6.23.cp/configure.ac 2008-06-24 01:17:27.000000000 +0200
-@@ -482,7 +482,7 @@
- AC_SUBST(QT3_CFLAGS)
- AC_SUBST(QT3_LIBS)
- QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
-- AC_PATH_PROGS(MOC_QT3, [moc-qt3 moc], no, [$QT3_PREFIX])
-+ AC_PATH_PROGS(MOC_QT3, [moc-qt3 moc], no, [/usr/bin])
- if test "$MOC_QT3" = no; then
- AC_MSG_ERROR([Could not find QT3 moc])
- fi
-@@ -507,7 +507,7 @@
- AC_SUBST(QT4_CFLAGS)
- AC_SUBST(QT4_LIBS)
- QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
-- AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
-+ AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [/usr/bin/qt4])
- if test "$MOC_QT4" = no; then
- AC_MSG_ERROR([Could not find QT4 moc])
- fi
+--- avahi-0.6.31/configure 2012-02-14 17:36:33.221047221 -0500
++++ avahi-0.6.31.o/configure 2012-06-13 00:55:43.876468604 -0400
+@@ -20670,7 +20670,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QT3_PREFIX
++for as_dir in /usr/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -20840,7 +20840,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QT4_PREFIX
++for as_dir in /usr/bin/qt4
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (46506487785030410f2f4d560bced028aaedc911), Sukneet Basuta, 06/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page