| 1 |
commit: 3427a8fed450601d6edfce892c2de44166770c0a |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Fri Feb 25 09:34:38 2011 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Fri Feb 25 09:34:38 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3427a8fe |
| 7 |
|
| 8 |
x11-libs/gtk+: Revbump to fix double free error in some applications |
| 9 |
|
| 10 |
--- |
| 11 |
x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch | 24 ++++++++++++++++++++ |
| 12 |
.../{gtk+-3.0.1.ebuild => gtk+-3.0.1-r1.ebuild} | 2 + |
| 13 |
2 files changed, 26 insertions(+), 0 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..31c30d4 |
| 18 |
--- /dev/null |
| 19 |
+++ b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch |
| 20 |
@@ -0,0 +1,24 @@ |
| 21 |
+From 651410fa2a2c9c1e390ecbe384ea259f9bd319c8 Mon Sep 17 00:00:00 2001 |
| 22 |
+From: Carlos Garcia Campos <cgarcia@××××××.com> |
| 23 |
+Date: Thu, 24 Feb 2011 16:38:40 +0000 |
| 24 |
+Subject: Copy event axes for double/triple click events in gdk_event_copy() |
| 25 |
+ |
| 26 |
+Button event axes for double/triple click events are freed by |
| 27 |
+gdk_event_free(), so copy them to avoid an invalid free when releasing a |
| 28 |
+copied event. |
| 29 |
+--- |
| 30 |
+diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c |
| 31 |
+index 5188e1e..25853da 100644 |
| 32 |
+--- a/gdk/gdkevents.c |
| 33 |
++++ b/gdk/gdkevents.c |
| 34 |
+@@ -555,6 +555,8 @@ gdk_event_copy (const GdkEvent *event) |
| 35 |
+ break; |
| 36 |
+ |
| 37 |
+ case GDK_BUTTON_PRESS: |
| 38 |
++ case GDK_2BUTTON_PRESS: |
| 39 |
++ case GDK_3BUTTON_PRESS: |
| 40 |
+ case GDK_BUTTON_RELEASE: |
| 41 |
+ if (event->button.axes) |
| 42 |
+ new_event->button.axes = g_memdup (event->button.axes, |
| 43 |
+-- |
| 44 |
+cgit v0.8.3.4 |
| 45 |
|
| 46 |
diff --git a/x11-libs/gtk+/gtk+-3.0.1.ebuild b/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild |
| 47 |
similarity index 99% |
| 48 |
rename from x11-libs/gtk+/gtk+-3.0.1.ebuild |
| 49 |
rename to x11-libs/gtk+/gtk+-3.0.1-r1.ebuild |
| 50 |
index 55473c2..17e0249 100644 |
| 51 |
--- a/x11-libs/gtk+/gtk+-3.0.1.ebuild |
| 52 |
+++ b/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild |
| 53 |
@@ -91,6 +91,8 @@ src_prepare() { |
| 54 |
replace-flags -O3 -O2 |
| 55 |
strip-flags |
| 56 |
|
| 57 |
+ epatch "${FILESDIR}/${P}-double-free.patch" |
| 58 |
+ |
| 59 |
# Non-working test in gentoo's env |
| 60 |
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
| 61 |
-i gtk/tests/testing.c || die "sed 1 failed" |
Archives