diff options
| -rw-r--r-- | x11/py-gtk2/Makefile | 15 | ||||
| -rw-r--r-- | x11/py-gtk2/PLIST | 6 | ||||
| -rw-r--r-- | x11/py-gtk2/distinfo | 10 | ||||
| -rw-r--r-- | x11/py-gtk2/patches/patch-aa | 21 |
4 files changed, 20 insertions, 32 deletions
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index c38c14d4953..4f50d151e2d 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.67 2009/08/26 19:57:00 sno Exp $ +# $NetBSD: Makefile,v 1.68 2009/09/10 19:03:48 wiz Exp $ # -DISTNAME= pygtk-2.14.1 +DISTNAME= pygtk-2.16.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} -PKGREVISION= 2 CATEGORIES= x11 python -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.14/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.16/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= recht@NetBSD.org @@ -22,20 +21,18 @@ PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= gmake pkg-config -PLIST_VARS+= py25 PYTHON_VERSIONS_ACCEPTED= 26 25 -BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.16.0 - .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../graphics/py-cairo/buildlink3.mk" -.include "../../math/py-Numeric/buildlink3.mk" +.include "../../math/py-numpy/buildlink3.mk" +BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3 .include "../../devel/py-gobject/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.16.0 .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/py-gtk2/PLIST b/x11/py-gtk2/PLIST index 558a9d26c93..8bc2d9ad85d 100644 --- a/x11/py-gtk2/PLIST +++ b/x11/py-gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2009/06/14 22:06:41 joerg Exp $ +@comment $NetBSD: PLIST,v 1.25 2009/09/10 19:03:48 wiz Exp $ bin/pygtk-codegen-2.0 bin/pygtk-demo include/pygtk-2.0/pygtk/pygtk.h @@ -179,6 +179,7 @@ share/gtk-doc/html/pygtk/class-gtkaccelmap.html share/gtk-doc/html/pygtk/class-gtkaccessible.html share/gtk-doc/html/pygtk/class-gtkaction.html share/gtk-doc/html/pygtk/class-gtkactiongroup.html +share/gtk-doc/html/pygtk/class-gtkactivatable.html share/gtk-doc/html/pygtk/class-gtkadjustment.html share/gtk-doc/html/pygtk/class-gtkalignment.html share/gtk-doc/html/pygtk/class-gtkarrow.html @@ -602,6 +603,7 @@ share/pygtk/2.0/defs/atk.defs share/pygtk/2.0/defs/gdk-2.10.defs share/pygtk/2.0/defs/gdk-2.12.defs share/pygtk/2.0/defs/gdk-2.14.defs +share/pygtk/2.0/defs/gdk-2.16.defs share/pygtk/2.0/defs/gdk-base-types.defs share/pygtk/2.0/defs/gdk-base.defs share/pygtk/2.0/defs/gdk-types.defs @@ -612,6 +614,8 @@ share/pygtk/2.0/defs/gtk-2.12-types.defs share/pygtk/2.0/defs/gtk-2.12.defs share/pygtk/2.0/defs/gtk-2.14-types.defs share/pygtk/2.0/defs/gtk-2.14.defs +share/pygtk/2.0/defs/gtk-2.16-types.defs +share/pygtk/2.0/defs/gtk-2.16.defs share/pygtk/2.0/defs/gtk-base-types.defs share/pygtk/2.0/defs/gtk-base.defs share/pygtk/2.0/defs/gtk-extrafuncs.defs diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo index c062c979b38..6cb82a75ef9 100644 --- a/x11/py-gtk2/distinfo +++ b/x11/py-gtk2/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.25 2009/07/18 20:35:27 wiz Exp $ +$NetBSD: distinfo,v 1.26 2009/09/10 19:03:48 wiz Exp $ -SHA1 (pygtk-2.14.1.tar.bz2) = 9a9a29c9de2a31e08a96f38ade43ce93ec569400 -RMD160 (pygtk-2.14.1.tar.bz2) = ee32b54b5a5b12ca5718cf53505542b89e97347b -Size (pygtk-2.14.1.tar.bz2) = 2210535 bytes -SHA1 (patch-aa) = 6b2847b1c39dda79f87805fbc8b7d535c6a00b28 +SHA1 (pygtk-2.16.0.tar.bz2) = b8998ca94841906e71b2475319bb47c841b188e8 +RMD160 (pygtk-2.16.0.tar.bz2) = 76ef8d362975e8928e2e5499d8b5dffc32a5c9d8 +Size (pygtk-2.16.0.tar.bz2) = 2253202 bytes +SHA1 (patch-aa) = 5ea14628612cb204323ef6e169acb57a0887e737 diff --git a/x11/py-gtk2/patches/patch-aa b/x11/py-gtk2/patches/patch-aa index e01b6d766aa..9553c90cc16 100644 --- a/x11/py-gtk2/patches/patch-aa +++ b/x11/py-gtk2/patches/patch-aa @@ -1,27 +1,14 @@ -$NetBSD: patch-aa,v 1.2 2009/07/18 20:35:27 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2009/09/10 19:03:48 wiz Exp $ -Second chunk is from upstream -http://git.gnome.org/cgit/pygtk/commit/?id=956592c614c567623510dccf5fc1edaee9c766c1 - ---- gtk/gtk.override.orig 2009-03-05 22:06:49.000000000 +0000 +--- gtk/gtk.override.orig 2009-08-12 22:55:36.000000000 +0000 +++ gtk/gtk.override -@@ -1184,7 +1184,9 @@ _wrap_gtk_main(PyObject *self) - main_watch = pygtk_main_watch_new(); +@@ -1238,7 +1238,9 @@ _wrap_gtk_main(PyObject *self) pyg_begin_allow_threads; g_source_attach(main_watch, NULL); + g_source_unref(main_watch); + gdk_threads_enter(); gtk_main(); + gdk_threads_leave(); g_source_destroy(main_watch); pyg_end_allow_threads; if (PyErr_Occurred()) -@@ -7496,7 +7498,8 @@ _wrap_gtk_recent_info_get_application_in - &time_); - if (ret) { - py_ret = Py_BuildValue("(sii)", app_exec, count, time_); -- g_free(app_exec); -+ /* Note that we mustn't free 'app_exec' even though it's not -+ * 'const'. See bug #585458. */ - } else { - py_ret = Py_None; - } |