diff options
| author | Ross Burton <ross@openedhand.com> | 2006-12-24 09:34:49 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2006-12-24 09:34:49 +0000 |
| commit | 81b49595078d38239bb3f907a7e7814e5d30bb16 (patch) | |
| tree | f247aa3ca5c5b506543f99650b308f3d10d39d30 /meta/packages/avahi/avahi-0.6.15 | |
| parent | 8de8a38bfcbf27e11eed096a35d5f6bccd8d6d2a (diff) | |
| download | openembedded-core-81b49595078d38239bb3f907a7e7814e5d30bb16.tar.gz openembedded-core-81b49595078d38239bb3f907a7e7814e5d30bb16.tar.bz2 openembedded-core-81b49595078d38239bb3f907a7e7814e5d30bb16.zip | |
Merge avahi 0.6.15 from OE, to enable builds against DBus 1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1092 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/avahi/avahi-0.6.15')
| -rw-r--r-- | meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch | 28 |
1 files changed, 28 insertions, 0 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 new file mode 100644 index 0000000000..0971a9eea8 --- /dev/null +++ b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch @@ -0,0 +1,28 @@ +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, + |