From f06748f850a7e61bbdd22242c3c95ebbd68ce5dd Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Mon, 10 Mar 2008 19:08:25 +0000
Subject: [PATCH] fix building against latest glib2

---
 gtk2/gtk2.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gtk2/gtk2.spec b/gtk2/gtk2.spec
index c1110afcfe..5535a83dc4 100644
--- a/gtk2/gtk2.spec
+++ b/gtk2/gtk2.spec
@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        XWindow
 License:      GPL
 Version:      %{V_gtk_major}.%{V_gtk_minor}
-Release:      20080101
+Release:      20080310
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{version}.tar.gz
@@ -99,7 +99,6 @@ AutoReqProv:  no
         -e 's;\(gtk_query_immodules_2_0_LDFLAGS *=\);\1 -static;' \
         -e 's;^\(gtk_query_immodules_2_0_LDADD *=.*\);\1 -lpangoft2;' \
         gtk/Makefile.in
-
     %{l_shtool} subst \
         -e 's;\(gdk_pixbuf_csource_LDFLAGS *=\);\1 -static;' \
         -e 's;\(gdk_pixbuf_csource_LDADD .*\);\1 -lintl;' \
@@ -135,6 +134,12 @@ AutoReqProv:  no
         -e 's;\$(libdir)/locale;\$(datadir)/locale;' \
         po/Makefile.in.in
 
+    #   avoid conflict with newer glib
+    %{l_shtool} subst \
+        -e 's;g_hash_table_get_keys;my_g_hash_table_get_keys;g' \
+        gtk/gtkiconfactory.c \
+        gtk/gtkstock.c
+
 %build
     #   set x11 paths
     xinc=`%{l_rc} --query x11_incdir`