[Pkg-utopia-commits] r3501 - in /packages/unstable/dbus/debian: changelog patches/11_kfreebsd_kqueue_build_fix.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Feb  4 02:41:03 2010
New Revision: 3501

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3501
Log:
* debian/patches/11_kfreebsd_kqueue_build_fix.patch
  - Fix kqueue implementation on GNU/kFreeBSD. (Closes: #568338)
    Thanks to Cyril Brulebois for the patch.

Added:
    packages/unstable/dbus/debian/patches/11_kfreebsd_kqueue_build_fix.patch
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/patches/series

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3501&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Thu Feb  4 02:41:03 2010
@@ -1,3 +1,11 @@
+dbus (1.2.20-2) UNRELEASED; urgency=low
+
+  * debian/patches/11_kfreebsd_kqueue_build_fix.patch
+    - Fix kqueue implementation on GNU/kFreeBSD. (Closes: #568338)
+      Thanks to Cyril Brulebois for the patch.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 03 Feb 2010 23:08:12 +0100
+
 dbus (1.2.20-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/unstable/dbus/debian/patches/11_kfreebsd_kqueue_build_fix.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/11_kfreebsd_kqueue_build_fix.patch?rev=3501&op=file
==============================================================================
--- packages/unstable/dbus/debian/patches/11_kfreebsd_kqueue_build_fix.patch (added)
+++ packages/unstable/dbus/debian/patches/11_kfreebsd_kqueue_build_fix.patch Thu Feb  4 02:41:03 2010
@@ -1,0 +1,37 @@
+Description: Fix FTBFS on GNU/kFreeBSD
+ Fix kqueue implementation on *BSD.
+Author: Cyril Brulebois <kibi at debian.org>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568338
+--- a/bus/dir-watch-kqueue.c
++++ b/bus/dir-watch-kqueue.c
+@@ -139,17 +139,18 @@ out:
+ }
+ 
+ void
+-bus_set_watched_dir (BusContext *context, DBusList **directories)
++bus_set_watched_dirs (BusContext *context, DBusList **directories)
+ {
+   int new_fds[MAX_DIRS_TO_WATCH];
+   char *new_dirs[MAX_DIRS_TO_WATCH];
+   DBusList *link;
+-  int i, f, fd;
++  int i, j, f, fd;
++  struct kevent ev;
+ 
+   if (!_init_kqueue (context))
+     goto out;
+ 
+-  for (i = 0; i < MAX_DIRS_TO_WATCH; i++) {
++  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
+     {
+       new_fds[i] = -1;
+       new_dirs[i] = NULL;
+@@ -213,7 +214,7 @@ bus_set_watched_dir (BusContext *context
+                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
+           if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
+             {
+-              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
++              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
+               close (fd);
+               goto out;
+             }

Modified: packages/unstable/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/series?rev=3501&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/series (original)
+++ packages/unstable/dbus/debian/patches/series Thu Feb  4 02:41:03 2010
@@ -1,3 +1,4 @@
 00_dbus-quiesce-startup-errors.patch
 01_no-fatal-warnings.patch
 10_dbus-1.0.1-generate-xml-docs.patch
+11_kfreebsd_kqueue_build_fix.patch