summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2006-01-02 15:33:04 +0000
committerSven Wegener <swegener@gentoo.org>2006-01-02 15:33:04 +0000
commit4c67ce33d393019918501acf5688292efecfbd64 (patch)
treea22aca3ee443aa13711a9f0f1b813c961831f8c8 /net-dns
parentAdd ircd provide to init script, bug #114510. (diff)
downloadgentoo-2-4c67ce33d393019918501acf5688292efecfbd64.tar.gz
gentoo-2-4c67ce33d393019918501acf5688292efecfbd64.tar.bz2
gentoo-2-4c67ce33d393019918501acf5688292efecfbd64.zip
touchup the dbus patch
(Portage version: 2.0.53)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/avahi/files/0.6.1-dbus-0.60-support.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch b/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch
index b026c847755f..31bb76619c83 100644
--- a/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch
+++ b/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch
@@ -1,3 +1,5 @@
+# Slightly modified patch from upstream subversion
+
Index: avahi-daemon/dbus-protocol.c
===================================================================
--- avahi-daemon/dbus-protocol.c (revision 1027)
@@ -18,7 +20,7 @@ Index: avahi-daemon/dbus-protocol.c
+ if (dbus_bus_request_name(
+ server->bus,
+ AVAHI_DBUS_NAME,
-+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
+#else
+ DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,