Skip to Content.
Sympa Menu

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

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 (a058655b3fdd1264333a676fb9318a9bd2b3f127)
  • Date: Tue, 12 Jun 2012 23:50:40 -0500

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

utils/avahi/HISTORY | 7 -------
utils/avahi/PRE_BUILD | 2 ++
utils/avahi/qt.patch | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 7 deletions(-)

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

Revert "avahi: Do not run autoreconf as it seems to break install"

This reverts commit 87ea9be652ffaef69cd63225a2d207bcbe73443e.

Commited to soon. Somehow got it to not find QT4 moc.

diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 5a213f3..b3e670d 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,10 +1,3 @@
-2012-06-13 Sukneet Basuta <sukneet AT sourcemage.org>
- * PRE_BUILD: Do not run autoreconf as it seems to break install
- * qt.patch: Removed. QT4_PREFIX and QT3_PREFIX are detected properly
- on my boxes at least. If this is an issue consider changing
- $QT3_PREFIX on line 20673 and $QT4_PREFIX on line 20843 of configure
- rather than configure.ac
-
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 af50ea9..493a8f6 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,5 +1,7 @@
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
new file mode 100644
index 0000000..ebeecc6
--- /dev/null
+++ b/utils/avahi/qt.patch
@@ -0,0 +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



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

Archive powered by MHonArc 2.6.24.

Top of Page