aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/avahi/files/dbus-pre-1.1.1-support.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/avahi/files/dbus-pre-1.1.1-support.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/avahi/files/dbus-pre-1.1.1-support.patch')
-rw-r--r--recipes/avahi/files/dbus-pre-1.1.1-support.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/recipes/avahi/files/dbus-pre-1.1.1-support.patch b/recipes/avahi/files/dbus-pre-1.1.1-support.patch
new file mode 100644
index 0000000000..a92fb82710
--- /dev/null
+++ b/recipes/avahi/files/dbus-pre-1.1.1-support.patch
@@ -0,0 +1,17 @@
+http://avahi.org/changeset/1518
+
+Index: trunk/avahi-common/dbus-watch-glue.c
+===================================================================
+--- trunk/avahi-common/dbus-watch-glue.c (revision 1507)
++++ trunk/avahi-common/dbus-watch-glue.c (revision 1518)
+@@ -135,5 +135,9 @@
+ if (!(avahi_watch = poll_api->watch_new(
+ poll_api,
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+ dbus_watch_get_unix_fd(dbus_watch),
++#else
++ dbus_watch_get_fd(dbus_watch),
++#endif
+ translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
+ watch_callback,
+