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
commit8e47acb386e947539c3dce076013bec8bfeec458 (patch)
tree8ecb0cede496e44970dde85c201de7095d327710 /net-dns
parenttouchup the dbus patch (diff)
downloadhistorical-8e47acb386e947539c3dce076013bec8bfeec458.tar.gz
historical-8e47acb386e947539c3dce076013bec8bfeec458.tar.bz2
historical-8e47acb386e947539c3dce076013bec8bfeec458.zip
touchup the dbus patch
Package-Manager: portage-2.0.53
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/avahi/Manifest12
-rw-r--r--net-dns/avahi/files/0.6.1-dbus-0.60-support.patch4
2 files changed, 4 insertions, 12 deletions
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 3d6e2990ea47..d7a1eb82ec4a 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 61d06ab3b3190c4da02395258f5433a1 ChangeLog 3467
MD5 5da4a9160b981e4d0f2e64e12a39de37 avahi-0.5.2-r1.ebuild 2085
MD5 e02a44d127f87504f9e2c162c00e1d8f avahi-0.6.1-r1.ebuild 2765
MD5 10acd5db4e98791ddd421b34c404c7f3 avahi-0.6.1.ebuild 2402
-MD5 f950c746ff7017804d0265baf8b2390b files/0.6.1-dbus-0.60-support.patch 1074
+MD5 6c48d861f439c7f3c60dc22faf6a48a7 files/0.6.1-dbus-0.60-support.patch 1111
MD5 2189d236532868b9ae0d0ae87195acda files/0.6.1-need-dbus-initscript.patch 322
MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2-r1 63
MD5 82793ef545794b3d74b3094017ed5572 files/digest-avahi-0.6.1 63
MD5 82793ef545794b3d74b3094017ed5572 files/digest-avahi-0.6.1-r1 63
MD5 e522a390cede4510e8dbd0446e695912 metadata.xml 297
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDt8X5I1lqEGTUzyQRAlzSAJwIceqp250NcMuUtCjaTQcchl3UNACgsZre
-5Ss7uiQ2JZcIPh33SwazvB0=
-=Ghr3
------END PGP SIGNATURE-----
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,