diff options
| author | Ross Burton <ross@openedhand.com> | 2007-08-02 09:46:14 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-08-02 09:46:14 +0000 |
| commit | 3102a0f4be6bbd51413d8271ab252876cf9dabf1 (patch) | |
| tree | cefa1c253205cf702334313d47d678a993df2642 | |
| parent | c65df6c9409b057546d0b614ffdd5bd00ff5c891 (diff) | |
| download | openembedded-core-3102a0f4be6bbd51413d8271ab252876cf9dabf1.tar.gz openembedded-core-3102a0f4be6bbd51413d8271ab252876cf9dabf1.tar.bz2 openembedded-core-3102a0f4be6bbd51413d8271ab252876cf9dabf1.tar.xz openembedded-core-3102a0f4be6bbd51413d8271ab252876cf9dabf1.zip | |
Upgrade Avahi to 0.6.20
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2315 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch | 28 | ||||
| -rw-r--r-- | meta/packages/avahi/avahi_0.6.20.bb (renamed from meta/packages/avahi/avahi_0.6.15.bb) | 2 |
2 files changed, 0 insertions, 30 deletions
diff --git a/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch deleted file mode 100644 index 0971a9eea..000000000 --- a/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch +++ /dev/null @@ -1,28 +0,0 @@ -marcus 2006-11-11 02:56:18 UTC - - FreeBSD ports repository - - Modified files: - net/avahi Makefile distinfo - Added files: - net/avahi/files patch-avahi-daemon_dbus-protocol.c - Log: - Update to 0.6.15, and fix the build with D-BUS 1.0. - - Revision Changes Path - 1.43 +3 -3 ports/net/avahi/Makefile - 1.12 +3 -3 ports/net/avahi/distinfo - 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new) - ---- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006 -+++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006 -@@ -1067,7 +1067,7 @@ static int dbus_connect(void) { - if (dbus_bus_request_name( - server->bus, - AVAHI_DBUS_NAME, --#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -+#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0 - DBUS_NAME_FLAG_DO_NOT_QUEUE, - #else - DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, - diff --git a/meta/packages/avahi/avahi_0.6.15.bb b/meta/packages/avahi/avahi_0.6.20.bb index 46e8dc908..0ecd3fc59 100644 --- a/meta/packages/avahi/avahi_0.6.15.bb +++ b/meta/packages/avahi/avahi_0.6.20.bb @@ -3,8 +3,6 @@ require avahi.inc RDEPENDS_avahi-daemon = "sysvinit-pidof" PR = "r1" -SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0" - FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action" |