summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-02-03 21:43:07 +0000
committerPacho Ramos <pacho@gentoo.org>2011-02-03 21:43:07 +0000
commitc3a849c616ddbf7f5c572ec18546a5b2829b349c (patch)
tree2cab3749dd6e8714603135927915b579bfa12570 /dev-python/pygtk/files
parentVersion bump. Update to EAPI 4 and add myself as maintainer. (diff)
downloadhistorical-c3a849c616ddbf7f5c572ec18546a5b2829b349c.tar.gz
historical-c3a849c616ddbf7f5c572ec18546a5b2829b349c.tar.bz2
historical-c3a849c616ddbf7f5c572ec18546a5b2829b349c.zip
Fix 100% CPU load when apps receive SIGCHLD, bug #353599 by Antoine Martin.
Package-Manager: portage-2.1.9.35/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pygtk/files')
-rw-r--r--dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch b/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch
new file mode 100644
index 000000000000..3e5cd4553185
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch
@@ -0,0 +1,26 @@
+From 4cbd3c031289775f365c247f949d91facac4ba82 Mon Sep 17 00:00:00 2001
+From: Dieter Verfaillie <dieterv@optionexplicit.be>
+Date: Thu, 03 Feb 2011 12:44:10 +0000
+Subject: Fix pygtk_main_watch_check, copied from pygobject/glib/pygmainloop.c:pyg_signal_watch_check.
+
+Fixes bug 640738 and 638780.
+---
+diff --git a/gtk/gtk.override b/gtk/gtk.override
+index 75018f4..94309a6 100644
+--- a/gtk/gtk.override
++++ b/gtk/gtk.override
+@@ -1151,9 +1151,10 @@ pygtk_main_watch_check(GSource *source)
+ #ifdef HAVE_PYSIGNAL_SETWAKEUPFD
+ PySignalWatchSource *real_source = (PySignalWatchSource *)source;
+ GPollFD *poll_fd = &real_source->fd;
+- int data_size = 0;
++ unsigned char dummy;
++ gssize ret;
+ if (poll_fd->revents & G_IO_IN)
+- data_size = read(poll_fd->fd, 0, 1);
++ ret = read(poll_fd->fd, &dummy, 1);
+ #endif
+
+ state = pyg_gil_state_ensure();
+--
+cgit v0.8.3.1