[gtk2/f15] Add upstream patch for crasher bug #749541.
Bill Nottingham
notting at fedoraproject.org
Wed Nov 2 22:13:19 UTC 2011
commit d833e0c16ffaabc11a956564a58f87d7ff0b7281
Author: Bill Nottingham <notting at redhat.com>
Date: Wed Nov 2 15:45:29 2011 -0400
Add upstream patch for crasher bug #749541.
Upstream bug is https://bugzilla.gnome.org/show_bug.cgi?id=662633
0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch | 23 +++++++++++++++++++++++
gtk2.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch b/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch
new file mode 100644
index 0000000..b5351c6
--- /dev/null
+++ b/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch
@@ -0,0 +1,23 @@
+From 0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723 Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch at gimp.org>
+Date: Wed, 02 Nov 2011 19:27:39 +0000
+Subject: Bug 662633 - Scheduled transaction editor crashes with gtk+-2.24.7
+
+Fix commit a516d2359c9eac84bfa4682a70a62315adedb1d6: check if
+priv->arrow_button exists in forall().
+---
+diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
+index edeab88..b2c4b15 100644
+--- a/gtk/gtktoolbar.c
++++ b/gtk/gtktoolbar.c
+@@ -2532,7 +2532,7 @@ gtk_toolbar_forall (GtkContainer *container,
+ list = next;
+ }
+
+- if (include_internals)
++ if (include_internals && priv->arrow_button)
+ callback (priv->arrow_button, callback_data);
+ }
+
+--
+cgit v0.9.0.2
diff --git a/gtk2.spec b/gtk2.spec
index 978fd8c..14e4ae8 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -18,7 +18,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: 2.24.7
-Release: 1%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -40,6 +40,9 @@ Patch8: tooltip-positioning.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=611313
Patch15: window-dragging.patch
Patch16: gtk2-schar.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=662633
+# merged for 2.24.8
+Patch17: 0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: glib2-devel >= %{glib2_version}
@@ -157,6 +160,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
#%patch14 -p1 -b .landscape-pdf-print
%patch15 -p1 -b .window-dragging
%patch16 -p1 -b .schar
+%patch17 -p1 -b .toolbar-arrow-button
%build
# For the gobject-introspection patch
@@ -352,6 +356,9 @@ fi
%doc tmpdocs/examples
%changelog
+* Wed Nov 02 2011 Bill Nottingham <notting at redhat.com> - 2.24.7-3
+- add upstream patch for #749541/b.g.o #662633
+
* Mon Oct 17 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.7-1
- Update to 2.24.7
More information about the scm-commits
mailing list