diff options
| author | Michael Biebl <biebl@debian.org> | 2010-02-04 02:41:03 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-02-04 02:41:03 +0000 |
| commit | 4565e0ed9811be98699e2e5680d7f1fabc2a1540 (patch) | |
| tree | c75046ab4bc6ed4bbab75a7b4fb8ef9557ad3efc | |
| parent | 64db5b2625d94d69204ed16f30b9a6ca32e6e9ca (diff) | |
| download | dbus-4565e0ed9811be98699e2e5680d7f1fabc2a1540.tar.gz | |
* debian/patches/11_kfreebsd_kqueue_build_fix.patch
- Fix kqueue implementation on GNU/kFreeBSD. (Closes: #568338)
Thanks to Cyril Brulebois for the patch.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3501 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/11_kfreebsd_kqueue_build_fix.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e67c8c95..def3751b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@debian.org> Wed, 03 Feb 2010 23:08:12 +0100 + dbus (1.2.20-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/11_kfreebsd_kqueue_build_fix.patch b/debian/patches/11_kfreebsd_kqueue_build_fix.patch new file mode 100644 index 00000000..443ecc79 --- /dev/null +++ b/debian/patches/11_kfreebsd_kqueue_build_fix.patch @@ -0,0 +1,37 @@ +Description: Fix FTBFS on GNU/kFreeBSD + Fix kqueue implementation on *BSD. +Author: Cyril Brulebois <kibi@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; + } diff --git a/debian/patches/series b/debian/patches/series index 2867e270..96da4ab5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 |