summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2008-03-14 14:20:22 +0000
committerdrochner <drochner@pkgsrc.org>2008-03-14 14:20:22 +0000
commitb1d91e28ea0adc40ea1e7b382c766c9cf9882f0b (patch)
tree6c101b2c380c5efab29dae7d8043e60fe3082004
parent5108f37128c01866ffc3ad352231c0174535b9f6 (diff)
downloadpkgsrc-b1d91e28ea0adc40ea1e7b382c766c9cf9882f0b.tar.gz
fix locking around gtk mainloop, bump PKGREVISION
-rw-r--r--x11/py-gtk2/Makefile3
-rw-r--r--x11/py-gtk2/distinfo3
-rw-r--r--x11/py-gtk2/patches/patch-aa14
3 files changed, 18 insertions, 2 deletions
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 5c39ed5edbc..19ddfa2d404 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2008/01/09 18:56:01 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2008/03/14 14:20:22 drochner Exp $
#
DISTNAME= pygtk-2.12.1
+PKGREVISION= 1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.12/}
diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo
index 94652642b40..647e4ce8366 100644
--- a/x11/py-gtk2/distinfo
+++ b/x11/py-gtk2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.20 2008/01/09 18:56:02 drochner Exp $
+$NetBSD: distinfo,v 1.21 2008/03/14 14:20:22 drochner Exp $
SHA1 (pygtk-2.12.1.tar.bz2) = 7a7d095f53829895174640d693c4e4af16122d98
RMD160 (pygtk-2.12.1.tar.bz2) = c368deab52524248593b77984e93f18150efa0f4
Size (pygtk-2.12.1.tar.bz2) = 2175955 bytes
+SHA1 (patch-aa) = 940a7d45f5dfbaa78b8d89e29ad29355f37c456e
diff --git a/x11/py-gtk2/patches/patch-aa b/x11/py-gtk2/patches/patch-aa
new file mode 100644
index 00000000000..904f17de310
--- /dev/null
+++ b/x11/py-gtk2/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2008/03/14 14:20:22 drochner Exp $
+
+--- ./gtk/gtk.override.orig 2008-03-12 17:24:10.000000000 +0100
++++ ./gtk/gtk.override
+@@ -1183,7 +1183,9 @@ _wrap_gtk_main(PyObject *self)
+ main_watch = pygtk_main_watch_new();
+ pyg_begin_allow_threads;
+ g_source_attach(main_watch, NULL);
++ gdk_threads_enter();
+ gtk_main();
++ gdk_threads_leave();
+ g_source_destroy(main_watch);
+ pyg_end_allow_threads;
+ if (PyErr_Occurred())