diff options
| author | Michael Biebl <biebl@debian.org> | 2010-03-17 23:51:12 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-03-17 23:51:12 +0000 |
| commit | 0eab5fd823357b0ab6846259bf24bb429407a528 (patch) | |
| tree | b32d597fd34a7afa304494430c9768411e4db533 /debian | |
| parent | 7a869db02cd198a21fff2d15d98720d7084870c2 (diff) | |
| download | dbus-0eab5fd823357b0ab6846259bf24bb429407a528.tar.gz | |
* debian/patches/11_kfreebsd_kqueue_build_fix.patch
- Removed, merge upstream.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3562 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/11_kfreebsd_kqueue_build_fix.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 38 deletions
diff --git a/debian/changelog b/debian/changelog index 873e54f7..2d169a4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dbus (1.2.22-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches/11_kfreebsd_kqueue_build_fix.patch + - Removed, merge upstream. -- Michael Biebl <biebl@debian.org> Thu, 18 Mar 2010 00:32:27 +0100 diff --git a/debian/patches/11_kfreebsd_kqueue_build_fix.patch b/debian/patches/11_kfreebsd_kqueue_build_fix.patch deleted file mode 100644 index 443ecc79..00000000 --- a/debian/patches/11_kfreebsd_kqueue_build_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 96da4ab5..2867e270 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 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 |