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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 7 13:20:31 UTC 2008


Author: joss
Date: Sat Jun  7 13:20:30 2008
New Revision: 16191

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16191
Log:
60_pygtk-wakeupfd-fix.patch: do not use the wakeup fd in 
non-threaded applications, which is uninitialised and becomes 
stdin. Closes: #484654, #481480.

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=16191&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog (original)
+++ desktop/unstable/pygtk/debian/changelog Sat Jun  7 13:20:30 2008
@@ -1,3 +1,11 @@
+pygtk (2.12.1-6) unstable; urgency=low
+
+  * 60_pygtk-wakeupfd-fix.patch: do not use the wakeup fd in 
+    non-threaded applications, which is uninitialised and becomes 
+    stdin. Closes: #484654, #481480.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 07 Jun 2008 14:15:51 +0200
+
 pygtk (2.12.1-5) unstable; urgency=low
 
   * Revert 2.12.1-4 upload, re-add the fix, as anyway wakeupfd is used 

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=16191&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch (original)
+++ desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch Sat Jun  7 13:20:30 2008
@@ -1,7 +1,5 @@
-Similar to the fix to the initial SETWAKEUPFD support in GNOME #481569.
-
---- 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
+--- gtk/gtk.override.orig	2008-06-07 14:13:22.259007849 +0200
++++ gtk/gtk.override	2008-06-07 15:07:41.158504434 +0200
 @@ -37,6 +37,8 @@
  
  #include "pygtk-private.h"
@@ -34,7 +32,7 @@
      PySignal_SetWakeupFd(real_source->fds[1]);
  
  #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -1121,8 +1131,17 @@
+@@ -1121,8 +1131,18 @@
  {
      PyGILState_STATE state;
  
@@ -46,7 +44,8 @@
      state = pyg_gil_state_ensure();
  
 +#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
-+    read(real_source->fds[0], &buf, 1);
++    if (real_source->fds[0])
++        read(real_source->fds[0], &buf, 1);
 +#endif
 +
      if (PyErr_CheckSignals() == -1 && gtk_main_level() > 0) {




More information about the pkg-gnome-commits mailing list