Source Mage code commit list

[George Sherwood <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

 utils/avahi/HISTORY    |    4 ++++
 utils/avahi/PRE_BUILD  |    1 +
 utils/avahi/dbus.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)

New commits:
commit bf4a72b8dd7fc357067cf4182e5cbca60dc47d1f
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

    avahi: Added dbus.patch to allow to compile with dbus >= 1.0.0. Bug
    13303.

diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 484f5a4..eca45a2 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2006-12-02 George Sherwood <george AT beernabeer.com>
+       * PRE_BUILD: Added dbus.patch
+       * dbus.patch: Added to fix Bug #13303
+
 2006-11-14 Treeve Jelbert <treeve AT pi.be>
        * DETAILS: version 0.6.15
          SECURITY_PATCH++
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index e2e7baa..f06a978 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY      &&
 patch  -p1 < $SPELL_DIRECTORY/qt.patch  &&
+patch  -p0 < $SCRIPT_DIRECTORY/dbus.patch &&
 autoreconf
diff --git a/utils/avahi/dbus.patch b/utils/avahi/dbus.patch
new file mode 100644
index 0000000..5fa0626
--- /dev/null
+++ b/utils/avahi/dbus.patch
@@ -0,0 +1,45 @@
+--- avahi-daemon/dbus-protocol.c (revision 1299)
++++ avahi-daemon/dbus-protocol.c (revision 1333)
+@@ -1068,8 +1068,8 @@
+             server->bus,
+             AVAHI_DBUS_NAME,
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
++            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#else
+             DBUS_NAME_FLAG_DO_NOT_QUEUE,
+-#else
+-            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+ #endif
+             &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+@@ -1107,9 +1107,4 @@
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+@@ -1128,9 +1123,4 @@
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+@@ -1167,9 +1157,4 @@
+ fail:
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+     }
+