2007-08-18 Albert Lee <
[email protected]>
* SFEavahi.spec: Bump to 0.6.21, add avahi-01-dbus.diff
* SFEcairomm.spec: Bump to 1.4.2
* SFEf-spot.spec: Bump to 0.4.0, add f-spot-01-solaris.diff
* SFEgd.spec: Bump to 2.0.35
* SFEglibmm.spec: Bump to 2.12.10
* SFEgobby.spec: *NEW* Gobby distributed editor
* SFEgraphviz.spec: Bump to 2.14, update dependencies
* SFEgtkmm.spec: Bump to 2.10.11
* SFEguile.spec: Bump to 1.8.2
* SFEjokosher.spec: Update dependencies and paths
* SFElibdaemon.spec: Bump to 0.12
* SFElibxmlpp.spec: Bump to 2.19.1
* SFEnet6.spec: Bump to 1.3.5, add URL
* SFEobby.spec: Bump to 0.4.4, add URL
* patches/avahi-01-avahi-utils_stdb.c-prototype.diff:
Remove, merged upstream
* patches/avahi-01-dbus.diff: *NEW* Allow dbus backwards compatibility
* patches/f-spot-01-solaris.diff: *NEW* Patch for Solaris compatibility
* patches/ffmpeg-03-v4l2.diff: Try v4l2 read if mmap fails
* patches/gobby-01-prototype.diff: *NEW* Add missing includes
* patches/gobby-02-const.diff: *NEW* Preserve const-correctness
* patches/gobby-03-auto_ptr.diff: *NEW* Fix auto_ptr assignments
* patches/graphviz-01-tclsh.diff: Remove, merged upstream
* patches/graphviz-02-ruby-lib.diff: Remove, not needed
--- avahi-0.6.21.orig/configure.ac 2007年 8月 12日 日 12:08:24
+++ avahi-0.6.21/configure.ac 2007年 8月 17日 五 20:16:31
@@ -584,6 +584,10 @@
LIBS="$LIBS $DBUS_LIBS"
AC_CHECK_FUNCS([dbus_connection_close dbus_bus_get_private])
LIBS="$SAVED_LIBS"
+ AC_CHECK_LIB([dbus-1], [dbus_watch_get_unix_fd],
+ [AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [],
+ [Define if libdbus-1 has dbus_watch_get_unix_fd])],
+ [:], [$DBUS_LIBS])
fi
AM_CONDITIONAL(HAVE_DBUS, test "x$HAVE_DBUS" = "xyes")
--- avahi-0.6.21.orig/avahi-common/dbus-watch-glue.c 2007年 8月 12日 日 11:39:21
+++ avahi-0.6.21/avahi-common/dbus-watch-glue.c 2007年 8月 17日 五 20:18:12
@@ -26,6 +26,10 @@
#include "timeval.h"
#include "dbus-watch-glue.h"
+#ifndef HAVE_DBUS_WATCH_GET_UNIX_FD
+# define dbus_watch_get_unix_fd dbus_watch_get_fd
+#endif
+
static AvahiWatchEvent translate_dbus_to_avahi(unsigned int f) {
AvahiWatchEvent e = 0;