Integrate patch from upstream. Bump PKGREVISION.

Commit message upstream was:
Don't free a string we don't own
Fixes bug #585458.

3 files changed, 21 insertions, 7 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 72187a7b88d..ccabaf3c3d3 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2009/04/19 15:05:53 snj Exp $
+# $NetBSD: Makefile,v 1.65 2009/07/18 20:35:27 wiz Exp $
 #
 
 DISTNAME=	pygtk-2.14.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.14/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo
index 135b17d4c4b..c062c979b38 100644
--- a/x11/py-gtk2/distinfo
+++ b/x11/py-gtk2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2009/03/06 13:48:13 wiz Exp $
+$NetBSD: distinfo,v 1.25 2009/07/18 20:35:27 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) = 940a7d45f5dfbaa78b8d89e29ad29355f37c456e
+SHA1 (patch-aa) = 6b2847b1c39dda79f87805fbc8b7d535c6a00b28
diff --git a/x11/py-gtk2/patches/patch-aa b/x11/py-gtk2/patches/patch-aa
index 904f17de310..e01b6d766aa 100644
--- a/x11/py-gtk2/patches/patch-aa
+++ b/x11/py-gtk2/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2008/03/14 14:20:22 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/18 20:35:27 wiz 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)
+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
+@@ -1184,7 +1184,9 @@ _wrap_gtk_main(PyObject *self)
      main_watch = pygtk_main_watch_new();
      pyg_begin_allow_threads;
      g_source_attach(main_watch, NULL);
@@ -12,3 +15,13 @@ $NetBSD: patch-aa,v 1.1 2008/03/14 14:20:22 drochner Exp $
      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;
+     }