r15973 - in /desktop/unstable/pygobject/debian: changelog patches/61_wakeupfd-fix.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri May 16 12:14:44 2008
New Revision: 15973

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15973
Log:
* Update 61_wakeupfd-fix to use more ifdefs for python without the wakeupfd
  support; see #481457.

Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=15973&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog (original)
+++ desktop/unstable/pygobject/debian/changelog Fri May 16 12:14:44 2008
@@ -1,3 +1,10 @@
+pygobject (2.14.1-6) unstable; urgency=low
+
+  * Update 61_wakeupfd-fix to use more ifdefs for python without the wakeupfd
+    support; see #481457.
+
+ -- Loic Minier <lool at dooz.org>  Fri, 16 May 2008 14:14:06 +0200
+
 pygobject (2.14.1-5) unstable; urgency=low
 
   * New patch, 61_wakeupfd-fix, from the fix to the initial SETWAKEUPFD

Modified: desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch?rev=15973&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch (original)
+++ desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch Fri May 16 12:14:44 2008
@@ -1,7 +1,7 @@
 From the fix to the initial SETWAKEUPFD support in GNOME #481569.
 
 --- pygobject-2.14.1/gobject/pygmainloop.c	2008-01-03 12:09:19.000000000 +0100
-+++ pygobject-2.14.1.new/gobject/pygmainloop.c	2008-05-15 14:56:28.000000000 +0200
++++ pygobject-2.14.1.new/gobject/pygmainloop.c	2008-05-16 14:13:41.000000000 +0200
 @@ -24,6 +24,7 @@
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
@@ -33,19 +33,23 @@
      PySignal_SetWakeupFd(real_source->fds[1]);
  
  #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -165,11 +174,14 @@
- {
+@@ -166,10 +175,19 @@
      PyGILState_STATE state;
      GMainLoop *main_loop;
--
+ 
++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
 +    PySignalWatchSource *real_source = (PySignalWatchSource *)source;
 +    char buf[1];
-+	
++#endif
++
      state = pyg_gil_state_ensure();
  
      main_loop = pyg_get_current_main_loop();
  
++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
 +    read(real_source->fds[0], &buf, 1);
++#endif
++
      if (PyErr_CheckSignals() == -1 && main_loop != NULL) {
  	PyErr_SetNone(PyExc_KeyboardInterrupt);
  	g_main_loop_quit(main_loop);