- updated to 2.24.26

[packages/crossmingw32-gtk+2.git] / crossmingw32-gtk+2.spec

diff --git a/crossmingw32-gtk+2.spec b/crossmingw32-gtk+2.spec
index 2ff9a0070b4971e9af5249d4733acb68a45561cf..bdd028ace225e4e341aa0eaf79edc4eaf2cd60e9 100644 (file)
--- a/crossmingw32-gtk+2.spec
+++ b/crossmingw32-gtk+2.spec
@@ -1,13 +1,12 @@
 Summary:       The GIMP Toolkit - MinGW32 cross version
 Summary(pl.UTF-8):     GIMP Toolkit - wersja skrośna dla MinGW32
 Name:          crossmingw32-gtk+2
-Version:       2.24.23
+Version:       2.24.26
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
-# Source0-md5: 0be39fbed4ca125645175cd6e22f2548
-Patch0:                gtk+2-format.patch
+# Source0-md5: 4610cc60ff96073b83dc7de254bdaf38
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.7
@@ -97,7 +96,15 @@ Biblioteki DLL GTK+ dla Windows.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1
+
+# avoid rebuilding builtin stock icons cache
+# (requires native gtk-update-icon-cache >= 2.24.24 < 3.0)
+touch gtk/stamp-icons gtk/gtkbuiltincache.h
+
+# -Wl, makes recent libtools pass it as linker flag before any objects,
+# which is incompatible with as-needed; use plain -luuid with pass_all
+# hack below
+%{__sed} -i -e 's@-Wl,-luuid@-luuid@' configure.ac
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -119,6 +126,11 @@ CPPFLAGS="%{rpmcppflags} -DWINVER=0x0500"
        --without-x \
        --without-xinput
 
+# by default mingw32 libtool doesn't allow to embed static libraries
+# in shared libraries (only import libraries are allowed); override this
+# to allow static libuuid
+%{__sed} -i -e 's/^\(deplibs_check_method\)=.*/\1="pass_all"/' libtool
+
 %{__make}
 
 %install