[oe-commits] org.oe.dev avahi: add 0.6.21

[pH5 commit]

avahi: add 0.6.21

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: d1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d
Files:
1
packages/avahi/avahi_0.6.21.bb
packages/avahi/files/dbus-pre-1.1.1-support.patch
Diffs:

#
# mt diff -r2fe4b71bd46729f460c8f38c28f97d1d8ee53d84 -rd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d
#
# 
# 
# add_file "packages/avahi/avahi_0.6.21.bb"
#  content [cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1]
# 
# add_file "packages/avahi/files/dbus-pre-1.1.1-support.patch"
#  content [d8bb507a275c57686d44908121501c39fda4d06c]
# 
============================================================
--- packages/avahi/avahi_0.6.21.bb	cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1
+++ packages/avahi/avahi_0.6.21.bb	cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1
@@ -0,0 +1,5 @@
+require avahi.inc
+
+PR = "r0"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
============================================================
--- packages/avahi/files/dbus-pre-1.1.1-support.patch	d8bb507a275c57686d44908121501c39fda4d06c
+++ packages/avahi/files/dbus-pre-1.1.1-support.patch	d8bb507a275c57686d44908121501c39fda4d06c
@@ -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,
+