patches/avahi-01-dbus.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 415 719739929d2d
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
415
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     1
--- avahi-0.6.21.orig/configure.ac	2007年  8月 12日 日 12:08:24
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     2
+++ avahi-0.6.21/configure.ac	2007年  8月 17日 五 20:16:31
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     3
@@ -584,6 +584,10 @@
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     4
     LIBS="$LIBS $DBUS_LIBS"
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     5
     AC_CHECK_FUNCS([dbus_connection_close dbus_bus_get_private])
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     6
     LIBS="$SAVED_LIBS"
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     7
+    AC_CHECK_LIB([dbus-1], [dbus_watch_get_unix_fd],
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     8
+                 [AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [],
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     9
+                            [Define if libdbus-1 has dbus_watch_get_unix_fd])],
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    10
+                 [:], [$DBUS_LIBS])
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    11
 fi
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    12
 AM_CONDITIONAL(HAVE_DBUS, test "x$HAVE_DBUS" = "xyes")
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    13
 
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    14
--- avahi-0.6.21.orig/avahi-common/dbus-watch-glue.c	2007年  8月 12日 日 11:39:21
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    15
+++ avahi-0.6.21/avahi-common/dbus-watch-glue.c	2007年  8月 17日 五 20:18:12
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    16
@@ -26,6 +26,10 @@
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    17
 #include "timeval.h"
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    18
 #include "dbus-watch-glue.h"
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    19
 
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    20
+#ifndef HAVE_DBUS_WATCH_GET_UNIX_FD
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    21
+# define dbus_watch_get_unix_fd dbus_watch_get_fd
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    22
+#endif
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    23
+
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    24
 static AvahiWatchEvent translate_dbus_to_avahi(unsigned int f) {
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    25
     AvahiWatchEvent e = 0;
719739929d2d 2007-08-18 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    26