Update to 3.13.3

.gitignore

@@ -80,3 +80,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-3.12.1.tar.xz
 /gtk+-3.13.1.tar.xz
 /gtk+-3.13.2.tar.xz
+/gtk+-3.13.3.tar.xz

0001-eventcontroller-Ensure-controllers-stay-alive-during.patch

@@ -1,33 +0,0 @@
-From 618e3d31570fca577cf374d7b318bc7ca44cadb1 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Wed, 28 May 2014 19:39:07 +0200
-Subject: [PATCH] eventcontroller: Ensure controllers stay alive during event
- emission
-
-Those might trigger the destruction of some widget that would dispose the
-event controller while the event is still being handled, so keep an extra
-ref on the controller during event processing.
----
- gtk/gtkeventcontroller.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c
-index b674380..c0b828f 100644
---- a/gtk/gtkeventcontroller.c
-+++ b/gtk/gtkeventcontroller.c
-@@ -205,7 +205,11 @@ gtk_event_controller_handle_event (GtkEventController *controller,
-   controller_class = GTK_EVENT_CONTROLLER_GET_CLASS (controller);
- 
-   if (controller_class->handle_event)
--    retval = controller_class->handle_event (controller, event);
-+    {
-+      g_object_ref (controller);
-+      retval = controller_class->handle_event (controller, event);
-+      g_object_unref (controller);
-+    }
- 
-   return retval;
- }
--- 
-2.0.0
-

0002-Revert-GtkMisc-Keep-gtk_misc_set_alignment-working.patch

@@ -1,57 +0,0 @@
-From 489b59867ce752a19d01fa43a86bbcefe6e7d8cf Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 29 May 2014 10:30:57 -0400
-Subject: [PATCH] Revert "GtkMisc: Keep gtk_misc_set_alignment working"
-
-This reverts commit aabc356b80fab025d460f61b6c08743b2c10e20d.
-
-Labels are back to looking at x/yalign (for now).
----
- gtk/deprecated/gtkmisc.c | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/gtk/deprecated/gtkmisc.c b/gtk/deprecated/gtkmisc.c
-index ff4db12..303b5e7 100644
---- a/gtk/deprecated/gtkmisc.c
-+++ b/gtk/deprecated/gtkmisc.c
-@@ -27,8 +27,6 @@
- #include "gtkmisc.h"
- #include "gtkintl.h"
- #include "gtkprivate.h"
--#include "gtkimage.h"
--#include "gtklabel.h"
- 
- 
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-@@ -234,28 +232,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
- 
-   priv = misc->priv;
- 
--  if (GTK_IS_LABEL (misc) || GTK_IS_IMAGE (misc))
--    {
--      GtkAlign halign, valign;
--
--      if (xalign < 0.4)
--        halign = GTK_ALIGN_START;
--      else if (xalign > 0.6)
--        halign = GTK_ALIGN_END;
--      else
--        halign = GTK_ALIGN_CENTER;
--
--      if (yalign < 0.4)
--        valign = GTK_ALIGN_START;
--      else if (yalign > 0.6)
--        valign = GTK_ALIGN_END;
--      else
--        valign = GTK_ALIGN_CENTER;
--
--      gtk_widget_set_halign (GTK_WIDGET (misc), halign);
--      gtk_widget_set_valign (GTK_WIDGET (misc), valign);
--    }
--
-   if (xalign < 0.0)
-     xalign = 0.0;
-   else if (xalign > 1.0)
--- 
-2.0.0
-

0003-GtkBuilder-Ensure-types-are-fully-initialized.patch

@@ -1,39 +0,0 @@
-From 6de6656d1f8d762093fe9d73f2713380573b9e39 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 30 May 2014 12:39:07 -0400
-Subject: [PATCH] GtkBuilder: Ensure types are fully initialized
-
-Just calling get_type() does not ensure that the signals, properties
-and everything else gets set up properly. Ensure it is, by calling
-g_type_class_ref() before using the type. This fixes the testcase
-added in the previous commit.
----
- gtk/gtkbuilder.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
-index f6e5c52..60927df 100644
---- a/gtk/gtkbuilder.c
-+++ b/gtk/gtkbuilder.c
-@@ -2275,10 +2275,17 @@ GType
- gtk_builder_get_type_from_name (GtkBuilder  *builder, 
-                                 const gchar *type_name)
- {
-+  GType type;
-+
-   g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
-   g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
- 
--  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
-+  type = GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
-+
-+  if (G_TYPE_IS_CLASSED (type))
-+    g_type_class_unref (g_type_class_ref (type));
-+
-+  return type;
- }
- 
- GQuark
--- 
-2.0.0
-

gtk3.spec

@@ -16,19 +16,14 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 3.13.2
-Release: 5%{?dist}
+Version: 3.13.3
+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.13/gtk+-%{version}.tar.xz
 
-# Backports from git master
-Patch1: 0001-eventcontroller-Ensure-controllers-stay-alive-during.patch
-Patch2: 0002-Revert-GtkMisc-Keep-gtk_misc_set_alignment-working.patch
-Patch3: 0003-GtkBuilder-Ensure-types-are-fully-initialized.patch
-
 BuildRequires: gnome-common autoconf automake intltool gettext
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: at-spi2-atk-devel
@@ -145,9 +140,6 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 
@@ -313,6 +305,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/installed-tests
 
 %changelog
+* Tue Jun 24 2014 Richard Hughes <rhughes@redhat.com> - 3.13.3-1
+- Update to 3.13.3
+
 * Sat Jun 07 2014 Tim Waugh <twaugh@redhat.com> - 3.13.2-5
 - Added build deps for cloudprint print backend module (bug #1104663).
 

sources

@@ -1 +1 @@
-47c23a8b8e2f84b0f622774c702fbff5  gtk+-3.13.2.tar.xz
+851a0a6a4dbafa2620ddce73b27651c6  gtk+-3.13.3.tar.xz