diff --git a/.gitignore b/.gitignore index aa1521c..340e228 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ gtk+-2.90.5.tar.bz2 /gtk+-3.11.7.tar.xz /gtk+-3.11.8.tar.xz /gtk+-3.11.9.tar.xz +/gtk+-3.12.0.tar.xz diff --git a/0001-container-guard-container-variable-by-reffing-it.patch b/0001-container-guard-container-variable-by-reffing-it.patch deleted file mode 100644 index 4a04fe7..0000000 --- a/0001-container-guard-container-variable-by-reffing-it.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 470a63f..12692d7 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -16,15 +16,13 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 -Version: 3.11.9 -Release: 2%{?dist} +Version: 3.12.0 +Release: 1%{?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 +Source: http://download.gnome.org/sources/gtk+/3.12/gtk+-%{version}.tar.xz BuildRequires: gnome-common autoconf automake intltool gettext BuildRequires: atk-devel >= %{atk_version} @@ -138,7 +136,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n gtk+-%{version} -%patch0 -p1 %build @@ -301,6 +298,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %{_datadir}/installed-tests %changelog +* Tue Mar 25 2014 Richard Hughes - 3.12.0-1 +- Update to 3.12.0 + * Wed Mar 19 2014 Kalev Lember - 3.11.9-2 - Backport a patch for a gnome-terminal crash diff --git a/sources b/sources index 8489fa2..c0ae628 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9ad3e78a2d33a30514be4d8dfedd300 gtk+-3.11.9.tar.xz +4e493fb68cded7420a7d8bcebdf13811 gtk+-3.12.0.tar.xz