r15971 - in /desktop/unstable/pygtk/debian: changelog patches/60_pygtk-wakeupfd-fix.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri May 16 11:22:02 2008
New Revision: 15971

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

Modified:
    desktop/unstable/pygtk/debian/changelog
    desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch

Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=15971&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog (original)
+++ desktop/unstable/pygtk/debian/changelog Fri May 16 11:22:02 2008
@@ -1,7 +1,9 @@
-pygtk (2.12.1-3) UNRELEASED; urgency=low
+pygtk (2.12.1-3) unstable; urgency=low
 
   * Bump Standards-Version to 3.7.3.
   * s/python/Python in description
+  * Update 60_pygtk-wakeupfd-fix to use more ifdefs for python without the
+    wakeupfd support; closes: #481457.
 
  -- Loic Minier <lool at dooz.org>  Thu, 15 May 2008 21:59:27 +0200
 

Modified: desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch?rev=15971&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch (original)
+++ desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch Fri May 16 11:22:02 2008
@@ -2,15 +2,16 @@
 
 --- pygtk-2.12.1/gtk/gtk.override	2008-01-03 12:01:58.000000000 +0100
 +++ pygtk-2.12.1.new/gtk/gtk.override	2008-05-15 15:29:49.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "pygobject.h"
+@@ -37,6 +37,8 @@
  
- #include <locale.h>
+ #include "pygtk-private.h"
+ 
 +#include <fcntl.h>
- 
- #include <gtk/gtk.h>
- #include <gtk/gtktreeitem.h>
-@@ -1068,7 +1069,10 @@
++
+ #define PYGTK_CONTAINER_FOREACH 0
+ #define PYGTK_CONTAINER_FORALL 1
+ #define countof(array) (sizeof(array)/sizeof(array[0]))
+@@ -1068,7 +1070,10 @@
  pygtk_main_watch_prepare(GSource *source,
  			 int     *timeout)
  {
@@ -21,7 +22,7 @@
  
      /* Python only invokes signal handlers from the main thread,
       * so if a thread other than the main thread receives the signal
-@@ -1102,6 +1106,11 @@
+@@ -1102,6 +1107,11 @@
      real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
      g_source_add_poll(source, &real_source->fd);
  
@@ -33,16 +34,21 @@
      PySignal_SetWakeupFd(real_source->fds[1]);
  
  #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -1121,8 +1130,12 @@
+@@ -1121,8 +1131,17 @@
  {
      PyGILState_STATE state;
  
++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
 +    PySignalWatchSource *real_source = (PySignalWatchSource *)source;
 +    char buf[1];
++#endif
 +
      state = pyg_gil_state_ensure();
  
++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
 +    read(real_source->fds[0], &buf, 1);
++#endif
++
      if (PyErr_CheckSignals() == -1 && gtk_main_level() > 0) {
  	PyErr_SetNone(PyExc_KeyboardInterrupt);
  	gtk_main_quit();