avahi: add 0.6.21

diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
new file mode 100644 (file)
index 0000000..fb6191e
--- /dev/null
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -0,0 +1,5 @@
+require avahi.inc
+
+PR = "r0"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"

diff --git a/packages/avahi/files/dbus-pre-1.1.1-support.patch b/packages/avahi/files/dbus-pre-1.1.1-support.patch
new file mode 100644 (file)
index 0000000..a92fb82
--- /dev/null
+++ b/packages/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,
+