From 34e8dba905d097d340de47949e2005382ba5d869 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 23 Apr 2011 13:27:58 +0200 Subject: [PATCH] Update to 2.28.6 - Update to 2.28.6 - Dropped the ugly build hack as it isn't needed anymore (the broken mingw32-runtime has been fixed by now) - Made the pkgconfig LDFLAGS libtool friendly (fixes compilation for non-libtool based projects such as midori) --- .gitignore | 1 + mingw32-glib2.spec | 25 ++++++++++--------------- sources | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 633acfa..a5eb804 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ glib-2.25.17.tar.bz2 glib-2.26.0.tar.bz2 glib-2.28.0.tar.bz2 glib-2.27.93.tar.bz2 +/glib-2.28.6.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index ce5a332..ede6b5c 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.28.0 +Version: 2.28.6 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -73,12 +73,6 @@ pushd build_static %{_mingw32_configure} --disable-shared --enable-static # HACK cp glib/glibconfig.h ../glib - # evil Hack - if [ -f /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtbegin.o ]; then - perl -i -pe "s,\\$\(AM_V_CCLD\)\\$\(LINK\) \\$\(glib_compile_schemas_OBJECTS\) \\$\(glib_compile_schemas_LDADD\) \\$\(LIBS\),/usr/libexec/gcc/i686-pc-mingw32/4.5.1/collect2 --sysroot=/usr/i686-pc-mingw32/sys-root -Bdynamic -o glib-compile-schemas.exe /usr/i686-pc-mingw32/sys-root/mingw/lib/crt2.o /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtbegin.o -L/usr/lib64/gcc/i686-pc-mingw32/4.5.1 -L/usr/lib64/gcc/i686-pc-mingw32/4.5.1/../../../../i686-pc-mingw32/lib -L/usr/i686-pc-mingw32/sys-root/mingw/lib gvdb-builder.o glib-compile-schemas.o ../glib/.libs/libglib-2.0.a -lws2_32 -lole32 -lkernel32 -lintl -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 -lmingw32 /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtend.o," gio/Makefile - else - perl -i -pe "s,\\$\(AM_V_CCLD\)\\$\(LINK\) \\$\(glib_compile_schemas_OBJECTS\) \\$\(glib_compile_schemas_LDADD\) \\$\(LIBS\),/usr/libexec/gcc/i686-pc-mingw32/4.5.1/collect2 --sysroot=/usr/i686-pc-mingw32/sys-root -Bdynamic -o glib-compile-schemas.exe /usr/i686-pc-mingw32/sys-root/mingw/lib/crt2.o /usr/lib/gcc/i686-pc-mingw32/4.5.1/crtbegin.o -L/usr/lib/gcc/i686-pc-mingw32/4.5.1 -L/usr/lib/gcc/i686-pc-mingw32/4.5.1/../../../../i686-pc-mingw32/lib -L/usr/i686-pc-mingw32/sys-root/mingw/lib gvdb-builder.o glib-compile-schemas.o ../glib/.libs/libglib-2.0.a -lws2_32 -lole32 -lkernel32 -lintl -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 -lmingw32 /usr/lib/gcc/i686-pc-mingw32/4.5.1/crtend.o," gio/Makefile - fi make %{?_smp_mflags} popd @@ -87,12 +81,6 @@ pushd build_shared %{_mingw32_configure} --disable-static # HACK cp glib/glibconfig.h ../glib - # evil Hack - if [ -f /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtbegin.o ]; then - perl -i -pe "s,\\$\(AM_V_CCLD\)\\$\(LINK\) \\$\(glib_compile_schemas_OBJECTS\) \\$\(glib_compile_schemas_LDADD\) \\$\(LIBS\),/usr/libexec/gcc/i686-pc-mingw32/4.5.1/collect2 --sysroot=/usr/i686-pc-mingw32/sys-root -Bdynamic -o glib-compile-schemas.exe /usr/i686-pc-mingw32/sys-root/mingw/lib/crt2.o /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtbegin.o -L/usr/i686-pc-mingw32/sys-root/mingw/lib -L/usr/lib64/gcc/i686-pc-mingw32/4.5.1 -L/usr/lib64/gcc/i686-pc-mingw32/4.5.1/../../../../i686-pc-mingw32/lib -L/usr/i686-pc-mingw32/sys-root/mingw/lib gvdb-builder.o glib-compile-schemas.o ../glib/.libs/libglib-2.0.dll.a -lws2_32 -lole32 -lintl -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 -lmingw32 /usr/lib64/gcc/i686-pc-mingw32/4.5.1/crtend.o," gio/Makefile - else - perl -i -pe "s,\\$\(AM_V_CCLD\)\\$\(LINK\) \\$\(glib_compile_schemas_OBJECTS\) \\$\(glib_compile_schemas_LDADD\) \\$\(LIBS\),/usr/libexec/gcc/i686-pc-mingw32/4.5.1/collect2 --sysroot=/usr/i686-pc-mingw32/sys-root -Bdynamic -o glib-compile-schemas.exe /usr/i686-pc-mingw32/sys-root/mingw/lib/crt2.o /usr/lib/gcc/i686-pc-mingw32/4.5.1/crtbegin.o -L/usr/i686-pc-mingw32/sys-root/mingw/lib -L/usr/lib/gcc/i686-pc-mingw32/4.5.1 -L/usr/lib/gcc/i686-pc-mingw32/4.5.1/../../../../i686-pc-mingw32/lib -L/usr/i686-pc-mingw32/sys-root/mingw/lib gvdb-builder.o glib-compile-schemas.o ../glib/.libs/libglib-2.0.dll.a -lws2_32 -lole32 -lintl -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 -lmingw32 /usr/lib/gcc/i686-pc-mingw32/4.5.1/crtend.o," gio/Makefile - fi make %{?_smp_mflags} popd @@ -158,8 +146,8 @@ find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \; # Let binaries depending on GLib link against libproxy-intl in a way that libtool doesn't refuse sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la -# Drop the reference to libintl from the pgkconfig and .la files as it's a soft dependency now -sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc +# Make the pkgconfig LDFLAGS libtool-friendly (as libintl it's a soft dependency now) +sed -i s/"-lintl"/"-Wl,-lintl"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc %find_lang glib20 @@ -226,6 +214,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 23 2011 Erik van Pienbroek - 2.28.6-1 +- Update to 2.28.6 +- Dropped the ugly build hack as it isn't needed anymore (the + broken mingw32-runtime has been fixed by now) +- Made the pkgconfig LDFLAGS libtool friendly (fixes compilation for + non-libtool based projects such as midori) + * Sun Feb 13 2011 Thomas Sailer - 2.28.0-1 - update to 2.28.0 diff --git a/sources b/sources index dde5d67..8de68dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51dbe36bc03a29a1f9bf6b74fb4a6926 glib-2.28.0.tar.bz2 +7d8fc15ae70d5111c0cf2a79d50ef717 glib-2.28.6.tar.bz2