[gtk2/f21] Update to 2.24.25

Kalev Lember kalev at fedoraproject.org
Sat Oct 11 12:02:39 UTC 2014


commit 0c11778daf50c98818c978562ca91f7ecc192e4f
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Oct 11 13:55:52 2014 +0200

    Update to 2.24.25

 .gitignore                                         |    1 +
 ...uf-engine-Avoid-a-crash-if-widget-is-NULL.patch |   31 -------
 ...not-release-the-GDK-lock-if-it-hasn-t-bee.patch |   88 --------------------
 gtk2.spec                                          |   12 +--
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 672c36b..5f3537c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ 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
diff --git a/gtk2.spec b/gtk2.spec
index f47bd0b..ca6eafd 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -17,8 +17,8 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.24.24
-Release: 4%{?dist}
+Version: 2.24.25
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -35,9 +35,6 @@ Patch2: icon-padding.patch
 Patch8: tooltip-positioning.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-Patch16: 0001-threads-Do-not-release-the-GDK-lock-if-it-hasn-t-bee.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=924683
-Patch17: 0001-pixbuf-engine-Avoid-a-crash-if-widget-is-NULL.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -149,8 +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 .trylock
-%patch17 -p1 -b .qtcrash
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -340,6 +335,9 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 %doc tmpdocs/examples
 
 %changelog
+* Sat Oct 11 2014 Kalev Lember <kalevlember at gmail.com> - 2.24.25-1
+- Update to 2.24.25
+
 * Mon Sep 29 2014 Matthias Clasen <mclasen at redhat.com> - 2.24.24-4
 - Avoid a crash in the pixbuf engine when used from Qt
 
diff --git a/sources b/sources
index 3f4cd8e..644ee9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f80ac8aa95ea8482ad89656d0370752e  gtk+-2.24.24.tar.xz
+612350704dd3aacb95355a4981930c6f  gtk+-2.24.25.tar.xz


More information about the scm-commits mailing list