r21210 - in /desktop/experimental/glib2.0/debian: changelog patches/10_inotify_init1.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Sep  1 10:00:52 2009
New Revision: 21210

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21210
Log:
10_inotify_init1.patch: fall back on inotify_init when inotify_init1 
does not work, as happens with kernel versions < 2.6.27.
Closes: #544354.

Added:
    desktop/experimental/glib2.0/debian/patches/10_inotify_init1.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=21210&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Sep  1 10:00:52 2009
@@ -1,3 +1,11 @@
+glib2.0 (2.21.5-2) UNRELEASED; urgency=low
+
+  * 10_inotify_init1.patch: fall back on inotify_init when inotify_init1 
+    does not work, as happens with kernel versions < 2.6.27.
+    Closes: #544354.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 01 Sep 2009 11:59:47 +0200
+
 glib2.0 (2.21.5-1) experimental; urgency=low
 
   * New upstream development release:

Added: desktop/experimental/glib2.0/debian/patches/10_inotify_init1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_inotify_init1.patch?rev=21210&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_inotify_init1.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/10_inotify_init1.patch [utf-8] Tue Sep  1 10:00:52 2009
@@ -1,0 +1,19 @@
+Debian #544354
+GNOME #593775
+
+Index: glib-2.20.5/gio/inotify/inotify-kernel.c
+===================================================================
+--- glib-2.20.5.orig/gio/inotify/inotify-kernel.c	2009-09-01 11:45:53.760521652 +0200
++++ glib-2.20.5/gio/inotify/inotify-kernel.c	2009-09-01 11:49:41.214630129 +0200
+@@ -193,8 +193,10 @@
+ #ifdef HAVE_INOTIFY_INIT1
+   inotify_instance_fd = inotify_init1 (IN_CLOEXEC);
+ #else
+-  inotify_instance_fd = inotify_init ();
++  inotify_instance_fd = -1;
+ #endif
++  if (inotify_instance_fd < 0)
++    inotify_instance_fd = inotify_init ();
+ 
+   if (inotify_instance_fd < 0)
+     return FALSE;

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=21210&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Sep  1 10:00:52 2009
@@ -2,4 +2,5 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_blacklist-directories.patch
 04_homedir_env.patch
+10_inotify_init1.patch
 60_wait-longer-for-threads-to-die.patch