diff options
author | 2006-01-06 12:26:09 +0000 | |
---|---|---|
committer | 2006-01-06 12:26:09 +0000 | |
commit | 4182f5536a465c02e996d9f4d5f86f84658e7365 (patch) | |
tree | 857ae6f558a4fdfdfc89bc25c8213793168ea274 /net-dns/avahi/files | |
parent | Fixed ebuild and marked ~ppc-macos (bug #106606) (diff) | |
download | historical-4182f5536a465c02e996d9f4d5f86f84658e7365.tar.gz historical-4182f5536a465c02e996d9f4d5f86f84658e7365.tar.bz2 historical-4182f5536a465c02e996d9f4d5f86f84658e7365.zip |
Remove fixes that have been included by upstream. Move from -* to ~arch.
Package-Manager: portage-2.0.53
Diffstat (limited to 'net-dns/avahi/files')
-rw-r--r-- | net-dns/avahi/files/0.6.1-dbus-0.60-support.patch | 31 | ||||
-rw-r--r-- | net-dns/avahi/files/digest-avahi-0.6.1 | 1 | ||||
-rw-r--r-- | net-dns/avahi/files/digest-avahi-0.6.1-r1 | 1 |
3 files changed, 0 insertions, 33 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 deleted file mode 100644 index 31bb76619c83..000000000000 --- a/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Slightly modified patch from upstream subversion - -Index: avahi-daemon/dbus-protocol.c -=================================================================== ---- avahi-daemon/dbus-protocol.c (revision 1027) -+++ 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, -+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, -+ 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; diff --git a/net-dns/avahi/files/digest-avahi-0.6.1 b/net-dns/avahi/files/digest-avahi-0.6.1 deleted file mode 100644 index f997656dd88a..000000000000 --- a/net-dns/avahi/files/digest-avahi-0.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 330613902c59bd597f140a8254e9f4ec avahi-0.6.1.tar.gz 850021 diff --git a/net-dns/avahi/files/digest-avahi-0.6.1-r1 b/net-dns/avahi/files/digest-avahi-0.6.1-r1 deleted file mode 100644 index f997656dd88a..000000000000 --- a/net-dns/avahi/files/digest-avahi-0.6.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 330613902c59bd597f140a8254e9f4ec avahi-0.6.1.tar.gz 850021 |