2.24.27

This reverts a series of commits that changed gtk-update-icon-cache to
not include image data in the generated image cache. It is safer to keep
this out of F20 to avoid introducing non-bugfix changes that might cause
a fallout in other packages. In particular, the gtk3 version in F20 is
not tested to work with this.

.gitignore

@@ -24,3 +24,5 @@ gtk+-2.21.5.tar.bz2
 /gtk+-2.24.19.tar.bz2
 /gtk+-2.24.20.tar.bz2
 /gtk+-2.24.21.tar.xz
+/gtk+-2.24.22.tar.bz2
+/gtk+-2.24.26.tar.bz2

gtk2-revert-gtk-update-icon-cache-changes.patch

@@ -0,0 +1,72 @@
+diff -up gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml.icon-cache gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml
+--- gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml.icon-cache	2014-09-29 16:02:16.000000000 -0400
++++ gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml	2015-02-19 21:06:03.858297553 -0500
+@@ -19,11 +19,8 @@
+ <command>gtk-update-icon-cache</command>
+ <arg choice="opt">--force</arg>
+ <arg choice="opt">--ignore-theme-index</arg>
+-<group>
+-  <arg choice="plain">--index-only</arg>
+-  <arg choice="plain">--include-image-data</arg>
+-</group>
+-<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
++<arg choice="opt">--index-only</arg>
++<arg choice="opt">--source<arg>name</arg></arg>
+ <arg choice="opt">--quiet</arg>
+ <arg choice="opt">--validate</arg>
+ <arg choice="req">iconpath</arg>
+@@ -74,12 +71,6 @@ multiple applications, the overall memor
+     </para></listitem>
+   </varlistentry>
+ 
+-  <varlistentry>
+-    <term>--include-image-data</term>
+-    <listitem><para>Include image data in the cache.
+-    </para></listitem>
+-  </varlistentry>
+-
+   <varlistentry>
+     <term>--source</term>
+     <term>-c</term>
+diff -up gtk+-2.24.26/gtk/Makefile.am.icon-cache gtk+-2.24.26/gtk/Makefile.am
+--- gtk+-2.24.26/gtk/Makefile.am.icon-cache	2015-02-19 21:06:03.859297565 -0500
++++ gtk+-2.24.26/gtk/Makefile.am	2015-02-19 21:07:17.775156092 -0500
+@@ -1400,7 +1400,6 @@ endif
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+ 	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+ 	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+-	   --include-image-data							\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+ 
+diff -up gtk+-2.24.26/gtk/Makefile.in.icon-cache gtk+-2.24.26/gtk/Makefile.in
+--- gtk+-2.24.26/gtk/Makefile.in.icon-cache	2015-02-19 21:06:03.861297588 -0500
++++ gtk+-2.24.26/gtk/Makefile.in	2015-02-19 21:07:49.894529160 -0500
+@@ -5713,7 +5713,6 @@ stamp-icons: $(STOCK_ICONS)
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+ 	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+ 	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+-	   --include-image-data							\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+ 
+diff -up gtk+-2.24.26/gtk/updateiconcache.c.icon-cache gtk+-2.24.26/gtk/updateiconcache.c
+--- gtk+-2.24.26/gtk/updateiconcache.c.icon-cache	2014-09-29 16:02:17.000000000 -0400
++++ gtk+-2.24.26/gtk/updateiconcache.c	2015-02-19 21:06:03.859297565 -0500
+@@ -46,7 +46,7 @@
+ static gboolean force_update = FALSE;
+ static gboolean ignore_theme_index = FALSE;
+ static gboolean quiet = FALSE;
+-static gboolean index_only = TRUE;
++static gboolean index_only = FALSE;
+ static gboolean validate = FALSE;
+ static gchar *var_name = "-";
+ 
+@@ -1659,7 +1659,6 @@ static GOptionEntry args[] = {
+   { "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if up to date"), NULL },
+   { "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence of index.theme"), NULL },
+   { "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
+-  { "include-image-data", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &index_only, N_("Include image data in the cache"), NULL },
+   { "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
+   { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
+   { "validate", 'v', 0, G_OPTION_ARG_NONE, &validate, N_("Validate existing icon cache"), NULL },

gtk2.spec

@@ -17,13 +17,13 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.24.21
+Version: 2.24.27
 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
@@ -31,11 +31,12 @@ Source4: update-gtk-immodules.1
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
+# Revert a series of gtk-update-icon-cache changes for F20
+Patch3: gtk2-revert-gtk-update-icon-cache-changes.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599618
 Patch8: tooltip-positioning.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=973730
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -145,6 +146,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 
 %patch1 -p1 -b .system-python
 %patch2 -p1 -b .icon-padding
+%patch3 -p1 -b .icon-cache
 %patch8 -p1 -b .tooltip-positioning
 %patch15 -p1 -b .window-dragging
 
@@ -222,7 +224,7 @@ done
 # for places where we have two copies of the GTK+ package installed.
 # (we might have x86_64 and i686 packages on the same system, for example.)
 case "$host" in
-  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*)
+  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*|aarch64*)
    mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
    ;;
   *)
@@ -336,6 +338,24 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 %doc tmpdocs/examples
 
 %changelog
+* Wed Mar 11 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
+
+* Mon Aug 25 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.24-2
+- Revert a series of gtk-update-icon-cache changes for F20
+
+* Mon Aug 25 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.24-1
+- Update to 2.24.24
+
+* Mon Nov 11 2013 Matthias Clasen <mclasen@redhat.com> - 2.24.22-2
+- Fix build on aarch64
+
+* Fri Oct 11 2013 Matthias Clasen <mclasen@redhat.com> - 2.24.22-1
+- Update to 2.24.22
+
 * Wed Sep 18 2013 Kalev Lember <kalevlember@gmail.com> - 2.24.21-1
 - Update to 2.24.21
 

sources

@@ -1 +1 @@
-d7ba702e76236237f2667f3def591fe7  gtk+-2.24.21.tar.xz
+f7c31d129f361ad689b6525c6236420a  gtk+-2.24.27.tar.bz2

update-gdk-pixbuf-loaders

@@ -39,7 +39,7 @@ fi
 FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders
 
 case "$host" in
-  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*|aarch64*)
    /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE
    ;;
   *)

update-gtk-immodules

@@ -8,7 +8,7 @@ fi
 umask 022
 
 case "$1" in
-  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*)
+  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*|aarch64*)
    /usr/bin/gtk-query-immodules-2.0-64 --update-cache
    ;;
   *)