2.24.28

Backport an upstream fix to avoid triggering abort() from F21 glib2 when
releasing a mutex that hasn't been locked yet.

https://bugzilla.redhat.com/show_bug.cgi?id=1138146

.gitignore

@@ -26,3 +26,7 @@ gtk+-2.21.5.tar.bz2
 /gtk+-2.24.21.tar.xz
 /gtk+-2.24.22.tar.bz2
 /gtk+-2.24.23.tar.xz
+/gtk+-2.24.25.tar.xz
+/gtk+-2.24.26.tar.bz2
+/gtk+-2.24.27.tar.bz2
+/gtk+-2.24.28.tar.bz2

0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch

@@ -1,25 +0,0 @@
-From 46b0c2938293b0495f65a46fdc632b788532639b Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Fri, 23 May 2014 11:19:53 +0200
-Subject: [PATCH] pixbuf-engine: Fix the build with -Werror=format-security
-
----
- modules/engines/pixbuf/pixbuf-rc-style.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
-index 4b86e4f..18851e3 100644
---- a/modules/engines/pixbuf/pixbuf-rc-style.c
-+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
-@@ -669,7 +669,7 @@ clear_theme_pixbuf_and_warn (ThemePixbuf **theme_pb,
-                              const char   *message)
- {
-   theme_clear_pixbuf (theme_pb);
--  g_scanner_warn (scanner, message);
-+  g_scanner_warn (scanner, "%s", message);
- }
- 
- static guint
--- 
-1.9.3
-

gtk2.spec

@@ -17,13 +17,13 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.24.23
-Release: 3%{?dist}
+Version: 2.24.28
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 #VCS: git:git://git.gnome.org/gtk+#gtk-2-24
-Source: http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.bz2
 Source2: update-gtk-immodules
 Source3: im-cedilla.conf
 Source4: update-gtk-immodules.1
@@ -35,8 +35,6 @@ Patch2: icon-padding.patch
 Patch8: tooltip-positioning.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-# Backported from upstream
-Patch16: 0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -148,7 +146,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch2 -p1 -b .icon-padding
 %patch8 -p1 -b .tooltip-positioning
 %patch15 -p1 -b .window-dragging
-%patch16 -p1 -b .format_security
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -338,6 +335,34 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 %doc tmpdocs/examples
 
 %changelog
+* Wed May 13 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.28-1
+- Update to 2.24.28
+
+* Tue Mar  3 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.27-1
+- Update to 2.24.27
+
+* Thu Feb 19 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.26-1
+- Update to 2.24.26
+
+* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.25-2
+- Use gtk-update-icon-cache that's built as gtk3 subpackage
+- Fix the build with latest gdk-pixbuf2
+
+* Sat Oct 11 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.25-1
+- Update to 2.24.25
+
+* Mon Sep 29 2014 Matthias Clasen <mclasen@redhat.com> - 2.24.24-4
+- Avoid a crash in the pixbuf engine when used from Qt
+
+* Thu Sep 04 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.24-3
+- Do not abort when releasing an unlocked mutex (#1138146)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.24.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 22 2014 Matthias Clasen <mclasen@redhat.com> - 2.24.24-1
+- Update to 2.24.24
+
 * Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.23-3
 - Rebuilt for gobject-introspection 1.41.4
 

sources

@@ -1 +1 @@
-0be39fbed4ca125645175cd6e22f2548  gtk+-2.24.23.tar.xz
+1065b2f8d88b67754545a96f3af815e1  gtk+-2.24.28.tar.bz2