- more -luuid hacks; release 2

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

diff --git a/crossmingw32-gtk+2.spec b/crossmingw32-gtk+2.spec
index 9fa451da12339b0c30503abcadb2bbfcb5349b04..606541023800a9bd47174ecbdb2a4c91d894277d 100644 (file)
--- a/crossmingw32-gtk+2.spec
+++ b/crossmingw32-gtk+2.spec
@@ -1,12 +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.17
+Version:       2.24.30
 Release:       2
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
-# Source0-md5: a10cc43fad8d64f8893d779b1f8322ff
+# Source0-md5: 04568ba5c58b75e3c7543e45628ad789
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.7
@@ -19,6 +19,7 @@ BuildRequires:        crossmingw32-pango >= 1.28.0
 BuildRequires: gtk-doc >= 1.17
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.15
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires:      crossmingw32-atk >= 1.30.0
@@ -43,7 +44,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 %define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
 
+%define                _ssp_cflags             %{nil}
 %ifnarch %{ix86}
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define                optflags        -O2
@@ -95,9 +98,17 @@ Biblioteki DLL GTK+ dla Windows.
 %prep
 %setup -q -n gtk+-%{version}
 
+# 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
-%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -116,6 +127,13 @@ 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
+# avoid -luuid in shared linking
+%{__sed} -i -e 's/ -luuid//;$aLibs.private: -luuid' gdk*.pc
+
 %{__make}
 
 %install
@@ -125,8 +143,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# avoid -luuid in shared linking
+%{__sed} -i -e 's/ -luuid//' $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
@@ -134,7 +155,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %endif
 
 # remove unsupported locale scheme
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,gtk-2.0,gtk-doc,locale,man,themes}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,gtk-2.0,gtk-doc,locale,themes}
 # shut up check-files (static modules and *.la for modules)
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{a,la}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/*/*.{a,la}