diff --git a/0001-container-guard-container-variable-by-reffing-it.patch b/0001-container-guard-container-variable-by-reffing-it.patch new file mode 100644 index 0000000..4a04fe7 --- /dev/null +++ b/0001-container-guard-container-variable-by-reffing-it.patch @@ -0,0 +1,36 @@ +From 38d1999f7b292993f8b5b7b3ff156e8c4f624552 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte +Date: Wed, 19 Mar 2014 13:23:38 +0100 +Subject: [PATCH] container: guard container variable by reffing it + +vte destroys the container during removal of a child. Don't crash in +that case due to recent a11y refactoring. + +https://bugzilla.gnome.org/show_bug.cgi?id=726369 +--- + gtk/gtkcontainer.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c +index 1a99de3..389e654 100644 +--- a/gtk/gtkcontainer.c ++++ b/gtk/gtkcontainer.c +@@ -1584,6 +1584,7 @@ gtk_container_remove (GtkContainer *container, + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container) || GTK_IS_ASSISTANT (container) || GTK_IS_ACTION_BAR (container)); + ++ g_object_ref (container); + g_object_ref (widget); + + g_signal_emit (container, container_signals[REMOVE], 0, widget); +@@ -1591,6 +1592,7 @@ gtk_container_remove (GtkContainer *container, + _gtk_container_accessible_remove (GTK_WIDGET (container), widget); + + g_object_unref (widget); ++ g_object_unref (container); + } + + void +-- +1.9.0 + diff --git a/gtk3.spec b/gtk3.spec index bb023a3..470a63f 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -17,12 +17,14 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 Version: 3.11.9 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/gtk+ Source: http://download.gnome.org/sources/gtk+/3.11/gtk+-%{version}.tar.xz +# Upstream backports: +Patch0: 0001-container-guard-container-variable-by-reffing-it.patch BuildRequires: gnome-common autoconf automake intltool gettext BuildRequires: atk-devel >= %{atk_version} @@ -136,6 +138,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n gtk+-%{version} +%patch0 -p1 %build @@ -298,6 +301,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %{_datadir}/installed-tests %changelog +* Wed Mar 19 2014 Kalev Lember - 3.11.9-2 +- Backport a patch for a gnome-terminal crash + * Tue Mar 18 2014 Richard Hughes - 3.11.9-1 - Update to 3.11.9