diff options
| author | wiz <wiz@pkgsrc.org> | 2009-07-18 20:35:27 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-07-18 20:35:27 +0000 |
| commit | b1ef0f2dec4082da6e6482e4d7e19da97aa870d9 (patch) | |
| tree | c24765f871247c4e1def36574e114199d410f78b /x11/py-gtk2/patches | |
| parent | 3c9beff5cb41b43a1a533ed18d5b761c488cf5cb (diff) | |
| download | pkgsrc-b1ef0f2dec4082da6e6482e4d7e19da97aa870d9.tar.gz | |
Integrate patch from upstream. Bump PKGREVISION.
Commit message upstream was:
Don't free a string we don't own
Fixes bug #585458.
Diffstat (limited to 'x11/py-gtk2/patches')
| -rw-r--r-- | x11/py-gtk2/patches/patch-aa | 21 |
1 files changed, 17 insertions, 4 deletions
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; + } |