OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Mar-2008 20:08:27
Branch: HEAD Handle: 2008031019082500
Modified files:
openpkg-src/gtk2 gtk2.spec
Log:
fix building against latest glib2
Summary:
Revision Changes Path
1.81 +7 -2 openpkg-src/gtk2/gtk2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.80 -r1.81 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 1 Jan 2008 14:55:10 -0000 1.80
+++ openpkg-src/gtk2/gtk2.spec 10 Mar 2008 19:08:25 -0000 1.81
@@ -39,7 +39,7 @@
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 @@
-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 @@
-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`
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
