sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Julien ROZO (f811c61cf81887c9031850b36fd5218cbcbe05b5)

From: Julien ROZO <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (f811c61cf81887c9031850b36fd5218cbcbe05b5)
Date: Thu, 27 Dec 2007 06:21:19 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

utils/avahi/DETAILS | 5 ++---
utils/avahi/HISTORY | 4 ++++
utils/avahi/PRE_BUILD | 10 +++++-----
utils/avahi/dbus.patch | 13 +++++++++++++
4 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit f811c61cf81887c9031850b36fd5218cbcbe05b5
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

avahi: updated version to 0.6.21, removed PATCHLEVEL;
added dbus.patch in PRE_BUILD to compile with dbus < 1.1.1

diff --git a/utils/avahi/DETAILS b/utils/avahi/DETAILS
index 1e837c4..2cd06f9 100755
--- a/utils/avahi/DETAILS
+++ b/utils/avahi/DETAILS
@@ -1,11 +1,10 @@
SPELL=avahi
- VERSION=0.6.20
+ VERSION=0.6.21
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL=http://avahi.org/download/${SOURCE}
-
SOURCE_HASH=sha512:8021b3abb4250c82991ec6cb8b548345f7f8b4425e504a40682436f259edc523125e1d17a99a08ea593868a54daf574b83e00ac229bf80c22329c99724bf699e
+
SOURCE_HASH=sha512:dfc1610d751071d179cff679ec265daaaa9a814e21f86237d4c70df4d06bc8e46f9274f418b29860608bf3f924ed0da2bd890297517020197d20455dcdd746eb
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SECURITY_PATCH=2
- PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=http://avahi.org/
ENTERED=20060626
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index b9a23fd..be4bc45 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2007-12-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.6.21, removed PATCHLEVEL
+ * PRE_BUILD, dbus.patch: added patch to compile with dbus < 1.1.1
+
2007-10-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Incremented PATCHLEVEL=1
* PRE_BUILD: Create netdev group
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index 83ffda9..5583d63 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,6 +1,6 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/qt.patch &&
-#patch -p0 < $SCRIPT_DIRECTORY/dbus.patch &&
-autoreconf &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/qt.patch &&
+patch -p2 < $SCRIPT_DIRECTORY/dbus.patch &&
+autoreconf &&
create_group netdev
diff --git a/utils/avahi/dbus.patch b/utils/avahi/dbus.patch
new file mode 100644
index 0000000..7736f41
--- /dev/null
+++ b/utils/avahi/dbus.patch
@@ -0,0 +1,13 @@
+--- /trunk/avahi-common/dbus-watch-glue.c (revision 1507)
++++ /trunk/avahi-common/dbus-watch-glue.c (revision 1518)
+@@ -135,5 +135,9 @@
+ if (!(avahi_watch = poll_api->watch_new(
+ poll_api,
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 &&
DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR >
1) || (DBUS_VERSION_MAJOR > 1)
+ dbus_watch_get_unix_fd(dbus_watch),
++#else
++ dbus_watch_get_fd(dbus_watch),
++#endif
+ translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
+ watch_callback,
+

[SM-Commit] GIT changes to master grimoire by Julien ROZO (f811c61cf81887c9031850b36fd5218cbcbe05b5), Julien ROZO, 12/27/2007