Call gnome2_environment_reset to let tests pass without permissions problems (bug #245103), note that it will only work if you have, at least, glib-2.30.1-r1. Drop old.

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

2 files changed, 0 insertions, 76 deletions

diff --git a/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch b/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
deleted file mode 100644
index cc1998561f7a..000000000000
--- a/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Disable tests using PObject that appears to be broken.
-Upstream unresponsive and application seem to be working still.
-
-Gentoo: #347183
-Gnome: #636589
---- a/tests/test_enum.py	2010-08-07 07:23:44.000000000 +0200
-+++ b/tests/test_enum.py	2011-01-19 18:43:58.946771795 +0100
-@@ -6,13 +6,6 @@
- from common import gobject, atk, gtk, gdk
- 
- 
--class PObject(gobject.GObject):
--    enum = gobject.property(type=gtk.WindowType, default=gtk.WINDOW_TOPLEVEL)
--    enum2 = gobject.property(type=gtk.WindowType, default=int(gtk.WINDOW_TOPLEVEL))
--    flags = gobject.property(type=gtk.AttachOptions, default=gtk.EXPAND)
--    flags2 = gobject.property(type=gtk.AttachOptions, default=int(gtk.EXPAND))
--
--
- class EnumTest(unittest.TestCase):
-     def testEnums(self):
-         self.failUnless(issubclass(gobject.GEnum, int))
-@@ -90,14 +83,6 @@
-         self.failUnless('7' in repr(val))
-         self.failUnless('GtkIconSize' in repr(val))
- 
--    def testEnumProperty(self):
--        default = PObject.props.enum.default_value
--        self.failUnless(isinstance(default, gtk.WindowType))
--        self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
--        default = PObject.props.enum2.default_value
--        self.failUnless(isinstance(default, gtk.WindowType))
--        self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
--
-     def testPickling(self):
-         values = [getattr(gtk, name) for name in dir(gtk)
-                   if isinstance(getattr(gtk, name), gobject.gobject.GEnum)]
-@@ -222,13 +207,5 @@
-         self.failUnless(flag <= 2)
-         self.failUnless(flag <= 10)
- 
--    def testFlagsProperty(self):
--        default = PObject.props.flags.default_value
--        self.failUnless(isinstance(default, gtk.AttachOptions))
--        self.assertEqual(default, gtk.EXPAND)
--        default = PObject.props.flags2.default_value
--        self.failUnless(isinstance(default, gtk.AttachOptions))
--        self.assertEqual(default, gtk.EXPAND)
--
- if __name__ == '__main__':
-     unittest.main()
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
deleted file mode 100644
index 3e5cd4553185..000000000000
--- a/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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