X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-glib2.spec;h=dc0d6ce4fda913e9a8845734cd20c8ca3fe3223d;hb=34981f85b17f375e7f5454f9d5d0cf5fa0cd6b10;hp=c159f066e25df68d21852e4be18b04867e496898;hpb=1bf6ca42e8b4f2ee81be2a402e2b16f1be422f17;p=packages%2Fcrossmingw32-glib2.git

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index c159f06..dc0d6ce 100644
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -12,26 +12,35 @@ Summary(tr.UTF-8):	Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):	实用工具函数库
 %define		realname   glib
 Name:		crossmingw32-glib2
-Version:	2.28.2
+Version:	2.46.1
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-%{version}.tar.bz2
-# Source0-md5:	24a4bea3167fed5dabe04afdb5b07231
-Patch0:		%{name}-stacktest.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.46/glib-%{version}.tar.xz
+# Source0-md5:	c90e93ceb45100ffc1d40ec5d2ca3248
+Patch0:		glib2-win32.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.10
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-gettext
+BuildRequires:	crossmingw32-libffi >= 3.0.0
 BuildRequires:	crossmingw32-libiconv
-BuildRequires:	crossmingw32-pcre >= 8.11
+BuildRequires:	crossmingw32-pcre >= 8.13
+# rand_s()
+BuildRequires:	crossmingw32-runtime >= 1:4.0.3-2
+BuildRequires:	crossmingw32-zlib
 # host glib-genmarshall and glib-compile-schemas are needed for cross-compiling
-BuildRequires:	glib2 >= 1:2.28.0
+BuildRequires:	glib2 >= 1:2.32.0
+BuildRequires:	gtk-doc >= 1.20
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig >= 1:0.16
+BuildRequires:	python >= 1:2.5
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	crossmingw32-gettext
-Requires:	crossmingw32-pcre >= 8.11
+Requires:	crossmingw32-pcre >= 8.13
+ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -47,13 +56,17 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+%define		__pkgconfig_requires	%{nil}
 
 %ifnarch %{ix86}
-# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
-%define		optflags	-O2
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc.
+# now at least i486 is required for atomic operations
+%define		optflags	-O2 -march=i486
 %endif
-# -z options are invalid for mingw linker
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define		filterout_ld	-Wl,-z,.*
+%define		filterout_c	-f[-a-z0-9=]*
 
 %description
 GLib, is a library which includes support routines for C such as
@@ -113,7 +126,8 @@ Summary:	DLL glib2 libraries for Windows
 Summary(pl.UTF-8):	Biblioteki DLL glib2 dla Windows
 Group:		Applications/Emulators
 Requires:	crossmingw32-gettext-dll
-Requires:	crossmingw32-pcre-dll >= 8.11
+Requires:	crossmingw32-libffi-dll >= 3.0.0
+Requires:	crossmingw32-pcre-dll >= 8.13
 Requires:	wine
 
 %description dll
@@ -135,8 +149,10 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__autoheader}
 %{__automake}
 %configure \
+	DBUS_DAEMON=no \
 	--target=%{target} \
 	--host=%{target} \
+	--disable-dtrace \
 	--disable-gtk-doc \
 	--disable-silent-rules \
 	--enable-shared \
@@ -158,10 +174,8 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/charset.alias
 # use system glib2-devel instead
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,glib-2.0,gtk-doc,man} \
-	$RPM_BUILD_ROOT/etc/bash_completion.d
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,bash-completion,gdb,glib-2.0,gtk-doc,man}
 # runtime
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
 
@@ -180,10 +194,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgmodule-2.0.la
 %{_libdir}/libgobject-2.0.la
 %{_libdir}/libgthread-2.0.la
-%{_libdir}/gio-2.0.def
-%{_libdir}/glib-2.0.def
-%{_libdir}/gmodule-2.0.def
-%{_libdir}/gobject-2.0.def
 %{_libdir}/gthread-2.0.def
 %{_includedir}/gio-win32-2.0
 %{_includedir}/glib-2.0