[Pkg-utopia-commits] r400 - in packages/experimental/avahi/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-12-15 10:25:28 +0000 (Thu, 15 Dec 2005)
New Revision: 400

Added:
   packages/experimental/avahi/debian/patches/01_dbus060_compatibility.patch
Modified:
   packages/experimental/avahi/debian/changelog
Log:
add dbus 0.60 compatiblity patch

Modified: packages/experimental/avahi/debian/changelog
===================================================================
--- packages/experimental/avahi/debian/changelog	2005-12-15 10:22:34 UTC (rev 399)
+++ packages/experimental/avahi/debian/changelog	2005-12-15 10:25:28 UTC (rev 400)
@@ -9,12 +9,14 @@
   * Split out avahi-discover into it's own package
   * Symlink /usr/include/avahi-compat-libdns_sd/dns_sd.h to
     /usr/include/dns_sd.h for API compatability
+  * debian/patches/01_dbus060_compatibility.patch
+    + Added. Enables build against dbus 0.60 (from upstream svn)
 
   [ Ross Burton ]
   * Add debian/watch
-  
- -- Sjoerd Simons <sjoerd at debian.org>  Sun,  4 Dec 2005 15:17:39 +0100
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 15 Dec 2005 11:24:43 +0100
+
 avahi (0.5.2-4) experimental; urgency=low
 
   * Add python2.4-gdbm dependency to python2.4-avahi (closes: #336900)

Added: packages/experimental/avahi/debian/patches/01_dbus060_compatibility.patch
===================================================================
--- packages/experimental/avahi/debian/patches/01_dbus060_compatibility.patch	2005-12-15 10:22:34 UTC (rev 399)
+++ packages/experimental/avahi/debian/patches/01_dbus060_compatibility.patch	2005-12-15 10:25:28 UTC (rev 400)
@@ -0,0 +1,29 @@
+Index: avahi-daemon/dbus-protocol.c
+===================================================================
+--- avahi-daemon/dbus-protocol.c	(revision 1039)
++++ avahi-daemon/dbus-protocol.c	(revision 1040)
+@@ -156,7 +156,6 @@
+     return client;
+ }
+ 
+-
+ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) {
+     DBusError error;
+ 
+@@ -1029,7 +1028,15 @@
+         goto fail;
+     }
+ 
+-    if (dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
++    if (dbus_bus_request_name(
++            server->bus,
++            AVAHI_DBUS_NAME,
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++            DBUS_NAME_FLAG_DO_NOT_QUEUE,
++#else
++            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#endif
++            &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+         if (dbus_error_is_set(&error)) {
+             avahi_log_error("dbus_bus_request_name(): %s", error.message);
+             goto fail;