net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

use dbus_watch_get_unix_fd() only in dbus >= 1.1.1

Index: trunk/avahi-common/dbus-watch-glue.c
===================================================================
--- trunk/avahi-common/dbus-watch-glue.c	(revision 1517)
+++ trunk/avahi-common/dbus-watch-glue.c	(revision 1518)
@@ -134,7 +134,11 @@
 
         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,
                   dbus_watch)))