From 7fef1500e4932c799093ccaa30d146c3e2a8503a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 26 Jan 2009 22:44:07 +0000 Subject: [PATCH 01/63] Setup of module mingw32-glib2 --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..22defba --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: mingw32-glib2 +# $Id$ +NAME := mingw32-glib2 +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From e6c547f5d48c19f35d7bfe5e210bef7281dfddc6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 28 Jan 2009 11:49:11 +0000 Subject: [PATCH 02/63] Initial import. --- .cvsignore | 1 + glib-i386-atomic.patch | 15 +++++ import.log | 1 + mingw32-glib2.spec | 140 +++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 158 insertions(+) create mode 100644 glib-i386-atomic.patch create mode 100644 import.log create mode 100644 mingw32-glib2.spec diff --git a/.cvsignore b/.cvsignore index e69de29..92dcd47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +glib-2.19.5.tar.bz2 diff --git a/glib-i386-atomic.patch b/glib-i386-atomic.patch new file mode 100644 index 0000000..01495c0 --- /dev/null +++ b/glib-i386-atomic.patch @@ -0,0 +1,15 @@ +diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure +--- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400 ++++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400 +@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse + + if test x"$GCC" = xyes; then + case $host_cpu in +- i386) +- { $as_echo "$as_me:$LINENO: result: none" >&5 +-$as_echo "none" >&6; } +- glib_memory_barrier_needed=no +- ;; + i?86) + { $as_echo "$as_me:$LINENO: result: i486" >&5 + $as_echo "i486" >&6; } diff --git a/import.log b/import.log new file mode 100644 index 0000000..bb8b3f9 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mingw32-glib2-2_19_5-2_fc11:HEAD:mingw32-glib2-2.19.5-2.fc11.src.rpm:1233143135 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec new file mode 100644 index 0000000..9e2a2d2 --- /dev/null +++ b/mingw32-glib2.spec @@ -0,0 +1,140 @@ +%define __strip %{_mingw32_strip} +%define __objdump %{_mingw32_objdump} +%define _use_internal_dependency_generator 0 +%define __find_requires %{_mingw32_findrequires} +%define __find_provides %{_mingw32_findprovides} + +Name: mingw32-glib2 +Version: 2.19.5 +Release: 2%{?dist} +Summary: MinGW Windows GLib2 library + +License: LGPLv2+ +Group: Development/Libraries +URL: http://www.gtk.org +Source0: http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +Patch0: glib-i386-atomic.patch + +BuildRequires: mingw32-filesystem >= 43-6 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-dlfcn +BuildRequires: mingw32-iconv +BuildRequires: mingw32-gettext + +BuildRequires: pkgconfig +# Native version required for msgfmt use in build +BuildRequires: gettext +# Native version required for glib-genmarshal +BuildRequires: glib2-devel + +# These are required for the glib-i386-atomic patch. +BuildRequires: autoconf, automake, libtool, gettext-devel, gtk-doc + +%description +MinGW Windows Glib2 library. + + +%prep +%setup -q -n glib-%{version} +%patch0 -p1 -b .i386-atomic + +# Required for the glib-i386-atomic patch. +libtoolize --force --copy +autoreconf + + +%build +%{_mingw32_configure} --disable-static +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR=$RPM_BUILD_ROOT install + +rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias + +# Remove manpages which duplicate Fedora native. +rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} + +%find_lang glib20 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f glib20.lang +%defattr(-,root,root) +%{_mingw32_bindir}/glib-genmarshal.exe +%{_mingw32_bindir}/glib-gettextize +%{_mingw32_bindir}/glib-mkenums +%{_mingw32_bindir}/gobject-query.exe +%{_mingw32_bindir}/gspawn-win32-helper-console.exe +%{_mingw32_bindir}/gspawn-win32-helper.exe +%{_mingw32_bindir}/libgio-2.0-0.dll +%{_mingw32_bindir}/libglib-2.0-0.dll +%{_mingw32_bindir}/libgmodule-2.0-0.dll +%{_mingw32_bindir}/libgobject-2.0-0.dll +%{_mingw32_bindir}/libgthread-2.0-0.dll +%{_mingw32_includedir}/glib-2.0/ +%{_mingw32_libdir}/gio-2.0.def +%{_mingw32_libdir}/glib-2.0.def +%{_mingw32_libdir}/glib-2.0/ +%{_mingw32_libdir}/gmodule-2.0.def +%{_mingw32_libdir}/gobject-2.0.def +%{_mingw32_libdir}/gthread-2.0.def +%{_mingw32_libdir}/libgio-2.0.dll.a +%{_mingw32_libdir}/libgio-2.0.la +%{_mingw32_libdir}/libglib-2.0.dll.a +%{_mingw32_libdir}/libglib-2.0.la +%{_mingw32_libdir}/libgmodule-2.0.dll.a +%{_mingw32_libdir}/libgmodule-2.0.la +%{_mingw32_libdir}/libgobject-2.0.dll.a +%{_mingw32_libdir}/libgobject-2.0.la +%{_mingw32_libdir}/libgthread-2.0.dll.a +%{_mingw32_libdir}/libgthread-2.0.la +%{_mingw32_libdir}/pkgconfig/gio-2.0.pc +%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc +%{_mingw32_libdir}/pkgconfig/glib-2.0.pc +%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc +%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc +%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc +%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc +%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc +%{_mingw32_datadir}/aclocal/glib-2.0.m4 +%{_mingw32_datadir}/aclocal/glib-gettext.m4 +%{_mingw32_datadir}/glib-2.0/ +%{_mingw32_datadir}/gtk-doc/html/gio/ +%{_mingw32_datadir}/gtk-doc/html/glib/ +%{_mingw32_datadir}/gtk-doc/html/gobject/ + + +%changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.19.5-2 +- Rebase to native Fedora version 2.19.5. +- Use _smp_mflags. +- Use find_lang. +- Don't build static libraries. +- +BR dlfcn. + +* Wed Sep 24 2008 Richard W.M. Jones - 2.18.1-2 +- Rename mingw -> mingw32. + +* Mon Sep 22 2008 Daniel P. Berrange - 2.18.1-1 +- Update to 2.18.1 release + +* Sun Sep 21 2008 Richard W.M. Jones - 2.18.0-3 +- Remove manpages which duplicate Fedora native. + +* Thu Sep 11 2008 Daniel P. Berrange - 2.18.0-2 +- Add BR on pkgconfig, gettext and glib2 (native) + +* Tue Sep 9 2008 Daniel P. Berrange - 2.18.0-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..8b0404f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b9f8453dd38266108641c448ea8d5bee glib-2.19.5.tar.bz2 From a037fa06e0fc127b605c323e0d457b87136924b6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 30 Jan 2009 11:16:49 +0000 Subject: [PATCH 03/63] Requires pkgconfig. --- mingw32-glib2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 9e2a2d2..18568de 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,7 +6,7 @@ Name: mingw32-glib2 Version: 2.19.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -35,6 +35,9 @@ BuildRequires: glib2-devel # These are required for the glib-i386-atomic patch. BuildRequires: autoconf, automake, libtool, gettext-devel, gtk-doc +Requires: pkgconfig + + %description MinGW Windows Glib2 library. @@ -117,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 30 2009 Richard W.M. Jones - 2.19.5-3 +- Requires pkgconfig. + * Fri Jan 23 2009 Richard W.M. Jones - 2.19.5-2 - Rebase to native Fedora version 2.19.5. - Use _smp_mflags. From 8d24dc234ca75a24f5a9ec2a980e0faf81ef0405 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Feb 2009 22:22:33 +0000 Subject: [PATCH 04/63] - Added -static subpackage - Developers using the static build of GLib need to add -DGLIB_STATIC_COMPILATION and -DGOBJECT_STATIC_COMPILATION to their CFLAGS to avoid compile failures - Fixed the %%defattr line - Rebuild for mingw32-gcc 4.4 (RWMJ) --- mingw32-glib2.spec | 81 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 18568de..f1ac0b3 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,7 +6,7 @@ Name: mingw32-glib2 Version: 2.19.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -19,7 +19,7 @@ BuildArch: noarch Patch0: glib-i386-atomic.patch -BuildRequires: mingw32-filesystem >= 43-6 +BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -41,6 +41,13 @@ Requires: pkgconfig %description MinGW Windows Glib2 library. +%package static +Summary: Static version of the MinGW Windows GLib2 library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows GLib2 library. %prep %setup -q -n glib-%{version} @@ -52,14 +59,61 @@ autoreconf %build -%{_mingw32_configure} --disable-static -make %{?_smp_mflags} +# GLib can't build static and shared libraries in one go, so we +# build GLib twice here +mkdir build_static +pushd build_static + %{_mingw32_configure} --disable-shared --enable-static + make %{?_smp_mflags} +popd +mkdir build_shared +pushd build_shared + %{_mingw32_configure} --disable-static + make %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +# First install all the files belonging to the shared build +make -C build_shared DESTDIR=$RPM_BUILD_ROOT install + +# Install all the files from the static build in a seperate folder +# and move the static libraries to the right location +make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install +mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir} + +# Manually merge the libtool files +sed -i s/"old_library=''"/"old_library='libgio-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgio-2.0.la +sed -i s/"old_library=''"/"old_library='libglib-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la +sed -i s/"old_library=''"/"old_library='libgobject-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgobject-2.0.la +sed -i s/"old_library=''"/"old_library='libgmodule-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgmodule-2.0.la +sed -i s/"old_library=''"/"old_library='libgthread-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgthread-2.0.la + +# There's also a small difference in the file glibconfig.h between the +# shared and the static build: +# +#diff -ur shared/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h static/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h +#--- shared/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h 2009-02-20 17:34:35.735677022 +0100 +#+++ static/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h 2009-02-20 17:33:35.498932269 +0100 +#@@ -92,7 +92,8 @@ +# +# #define G_OS_WIN32 +# #define G_PLATFORM_WIN32 +#- +#+#define GLIB_STATIC_COMPILATION 1 +#+#define GOBJECT_STATIC_COMPILATION 1 +# +# #define G_VA_COPY va_copy +# +# However, we can't merge this change as it is situation-dependent... +# +# Developers using the static build of GLib need to add -DGLIB_STATIC_COMPILATION +# and -DGOBJECT_STATIC_COMPILATION to their CFLAGS to avoid compile failures + +# Drop the folder which was temporary used for installing the static bits +rm -rf $RPM_BUILD_ROOT/build_static rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias @@ -74,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT %files -f glib20.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %{_mingw32_bindir}/glib-genmarshal.exe %{_mingw32_bindir}/glib-gettextize %{_mingw32_bindir}/glib-mkenums @@ -118,8 +172,23 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/gtk-doc/html/glib/ %{_mingw32_datadir}/gtk-doc/html/gobject/ +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libgio-2.0.a +%{_mingw32_libdir}/libglib-2.0.a +%{_mingw32_libdir}/libgmodule-2.0.a +%{_mingw32_libdir}/libgobject-2.0.a +%{_mingw32_libdir}/libgthread-2.0.a %changelog +* Fri Feb 20 2009 Erik van Pienbroek - 2.19.5-4 +- Added -static subpackage +- Developers using the static build of GLib need to add + -DGLIB_STATIC_COMPILATION and -DGOBJECT_STATIC_COMPILATION to + their CFLAGS to avoid compile failures +- Fixed the %%defattr line +- Rebuild for mingw32-gcc 4.4 (RWMJ) + * Fri Jan 30 2009 Richard W.M. Jones - 2.19.5-3 - Requires pkgconfig. From af2208331e5f015905f8679efbc7eba2f50efd5b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 01:08:12 +0000 Subject: [PATCH 05/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index f1ac0b3..d961639 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,7 +6,7 @@ Name: mingw32-glib2 Version: 2.19.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.a %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.19.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Erik van Pienbroek - 2.19.5-4 - Added -static subpackage - Developers using the static build of GLib need to add From 1a4e9269e64a5159cc88dec2a3204d565d004db4 Mon Sep 17 00:00:00 2001 From: epienbro Date: Thu, 5 Mar 2009 20:46:31 +0000 Subject: [PATCH 06/63] - Update to 2.19.10 - Dropped the gtk-doc documentation as it's identical to the base glib2 package --- .cvsignore | 2 +- mingw32-glib2.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 92dcd47..c8867cc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.19.5.tar.bz2 +glib-2.19.10.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index d961639..ed1deb8 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-glib2 -Version: 2.19.5 -Release: 5%{?dist} +Version: 2.19.10 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -117,8 +117,9 @@ rm -rf $RPM_BUILD_ROOT/build_static rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias -# Remove manpages which duplicate Fedora native. +# Remove the gtk-doc documentation and manpages which duplicate Fedora native rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc %find_lang glib20 @@ -168,9 +169,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/aclocal/glib-2.0.m4 %{_mingw32_datadir}/aclocal/glib-gettext.m4 %{_mingw32_datadir}/glib-2.0/ -%{_mingw32_datadir}/gtk-doc/html/gio/ -%{_mingw32_datadir}/gtk-doc/html/glib/ -%{_mingw32_datadir}/gtk-doc/html/gobject/ %files static %defattr(-,root,root,-) @@ -181,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.a %changelog +* Thu Mar 5 2009 Erik van Pienbroek - 2.19.10-1 +- Update to 2.19.10 +- Dropped the gtk-doc documentation as it's identical to the base glib2 package + * Wed Feb 25 2009 Fedora Release Engineering - 2.19.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 8b0404f..84c11fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f8453dd38266108641c448ea8d5bee glib-2.19.5.tar.bz2 +2cec449d5593835b6080d662a17078ca glib-2.19.10.tar.bz2 From efcb9a66b79624e38642eb2d70bf02f58c56e405 Mon Sep 17 00:00:00 2001 From: sailer Date: Thu, 16 Apr 2009 12:15:13 +0000 Subject: [PATCH 07/63] update to 2.20.1 --- .cvsignore | 1 + mingw32-glib2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8867cc..f5afe41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ glib-2.19.10.tar.bz2 +glib-2.20.1.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index ed1deb8..1080c55 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -5,14 +5,14 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-glib2 -Version: 2.19.10 +Version: 2.20.1 Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.20/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.a %changelog +* Thu Apr 16 2009 Thomas Sailer - 2.20.1-1 +- Update to 2.20.1 + * Thu Mar 5 2009 Erik van Pienbroek - 2.19.10-1 - Update to 2.19.10 - Dropped the gtk-doc documentation as it's identical to the base glib2 package diff --git a/sources b/sources index 84c11fe..b886b11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cec449d5593835b6080d662a17078ca glib-2.19.10.tar.bz2 +d7ef53c7b65827a1baa4bad1c6893fa3 glib-2.20.1.tar.bz2 From 39e691a92439333eade529956f273cf12647844a Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 10 Jun 2009 19:34:14 +0000 Subject: [PATCH 08/63] - Update to 2.21.1 - Use %global instead of %define - Dropped the glib-i386-atomic.patch as it doesn't have any effect (the mingw32 toolchain is called i686-pc-mingw32, not i386-pc-mingw32) --- glib-i386-atomic.patch | 15 --------------- mingw32-glib2.spec | 33 ++++++++++++++++----------------- 2 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 glib-i386-atomic.patch diff --git a/glib-i386-atomic.patch b/glib-i386-atomic.patch deleted file mode 100644 index 01495c0..0000000 --- a/glib-i386-atomic.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure ---- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400 -+++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400 -@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse - - if test x"$GCC" = xyes; then - case $host_cpu in -- i386) -- { $as_echo "$as_me:$LINENO: result: none" >&5 --$as_echo "none" >&6; } -- glib_memory_barrier_needed=no -- ;; - i?86) - { $as_echo "$as_me:$LINENO: result: i486" >&5 - $as_echo "i486" >&6; } diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 1080c55..fae8d75 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -1,24 +1,22 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-glib2 -Version: 2.20.1 +Version: 2.21.1 Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.20/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Patch0: glib-i386-atomic.patch - BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils @@ -32,9 +30,6 @@ BuildRequires: gettext # Native version required for glib-genmarshal BuildRequires: glib2-devel -# These are required for the glib-i386-atomic patch. -BuildRequires: autoconf, automake, libtool, gettext-devel, gtk-doc - Requires: pkgconfig @@ -49,13 +44,9 @@ Group: Development/Libraries %description static Static version of the MinGW Windows GLib2 library. + %prep %setup -q -n glib-%{version} -%patch0 -p1 -b .i386-atomic - -# Required for the glib-i386-atomic patch. -libtoolize --force --copy -autoreconf %build @@ -73,6 +64,7 @@ pushd build_shared make %{?_smp_mflags} popd + %install rm -rf $RPM_BUILD_ROOT @@ -178,7 +170,14 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgobject-2.0.a %{_mingw32_libdir}/libgthread-2.0.a + %changelog +* Wed Jun 10 2009 Erik van Pienbroek - 2.21.1-1 +- Update to 2.21.1 +- Use %%global instead of %%define +- Dropped the glib-i386-atomic.patch as it doesn't have any effect (the mingw32 + toolchain is called i686-pc-mingw32, not i386-pc-mingw32) + * Thu Apr 16 2009 Thomas Sailer - 2.20.1-1 - Update to 2.20.1 From df4a79524630f1c9c63ec6acddafdedbf70a87bf Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 10 Jun 2009 19:38:44 +0000 Subject: [PATCH 09/63] Forgot to do a 'make new-sources'.. --- .cvsignore | 3 +-- sources | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5afe41..4e26973 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -glib-2.19.10.tar.bz2 -glib-2.20.1.tar.bz2 +glib-2.21.1.tar.bz2 diff --git a/sources b/sources index b886b11..a39a2ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7ef53c7b65827a1baa4bad1c6893fa3 glib-2.20.1.tar.bz2 +eaf8f40c743effe26dab18c81b10a89e glib-2.21.1.tar.bz2 From 35ba24b6aa9f45fad85cdf395719844d64f2d6b0 Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 22 Jun 2009 11:03:10 +0000 Subject: [PATCH 10/63] - Update to 2.21.2 - Split out debug symbols to a -debuginfo subpackage --- .cvsignore | 2 +- mingw32-glib2.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e26973..40d1d80 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.1.tar.bz2 +glib-2.21.2.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index fae8d75..b2c7f0b 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,9 +3,10 @@ %global _use_internal_dependency_generator 0 %global __find_requires %{_mingw32_findrequires} %global __find_provides %{_mingw32_findprovides} +%define __os_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.21.1 +Version: 2.21.2 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -17,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 52 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -45,6 +46,9 @@ Group: Development/Libraries Static version of the MinGW Windows GLib2 library. +%{_mingw32_debug_package} + + %prep %setup -q -n glib-%{version} @@ -172,6 +176,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 22 2009 Erik van Pienbroek - 2.21.2-1 +- Update to 2.21.2 +- Split out debug symbols to a -debuginfo subpackage + * Wed Jun 10 2009 Erik van Pienbroek - 2.21.1-1 - Update to 2.21.1 - Use %%global instead of %%define diff --git a/sources b/sources index a39a2ac..370cd91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eaf8f40c743effe26dab18c81b10a89e glib-2.21.1.tar.bz2 +2dcb938db904efcc62757b3b0655593b glib-2.21.2.tar.bz2 From bece2af1d7517376d8f06800c8a1de99f7524371 Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 22 Jun 2009 11:45:37 +0000 Subject: [PATCH 11/63] MinGW compile fix (upstream GIT commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda) --- glib2-mingw-uih-header-compile-fix.patch | 37 ++++++++++++++++++++++++ mingw32-glib2.spec | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 glib2-mingw-uih-header-compile-fix.patch diff --git a/glib2-mingw-uih-header-compile-fix.patch b/glib2-mingw-uih-header-compile-fix.patch new file mode 100644 index 0000000..b24090f --- /dev/null +++ b/glib2-mingw-uih-header-compile-fix.patch @@ -0,0 +1,37 @@ +From 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 20 Jun 2009 03:18:09 +0000 +Subject: Fix build on mingw + +Mingw does not have sys/uio.h. This was reported in bug 585937. + +Author: Matthias Clasen +--- +diff --git a/configure.in b/configure.in +index de0d399..d253f60 100644 +--- a/configure.in ++++ b/configure.in +@@ -857,6 +857,7 @@ AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h]) + AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h]) + AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h]) + AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h]) ++AC_CHECK_HEADERS([sys/uio.h]) + + # check for structure fields + AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) +diff --git a/gio/gsocket.c b/gio/gsocket.c +index 0670ee4..151adb5 100644 +--- a/gio/gsocket.c ++++ b/gio/gsocket.c +@@ -38,7 +38,9 @@ + # include + #endif + ++#ifdef HAVE_SYS_UIO_H + #include ++#endif + + #include "gsocket.h" + #include "gcancellable.h" +-- +cgit v0.8.2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index b2c7f0b..3e9172a 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -16,6 +16,9 @@ URL: http://www.gtk.org Source0: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Git commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda +Patch0: glib2-mingw-uih-header-compile-fix.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 52 @@ -51,6 +54,7 @@ Static version of the MinGW Windows GLib2 library. %prep %setup -q -n glib-%{version} +%patch0 -p1 %build From 35847824d006c16a8add503e3975f748a661730c Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 22 Jun 2009 18:28:23 +0000 Subject: [PATCH 12/63] The wrong RPM variable was overriden for -debuginfo support. Should be okay now --- mingw32-glib2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 3e9172a..e78c8d7 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,11 +3,11 @@ %global _use_internal_dependency_generator 0 %global __find_requires %{_mingw32_findrequires} %global __find_provides %{_mingw32_findprovides} -%define __os_install_post %{_mingw32_debug_install_post} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 Version: 2.21.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 22 2009 Erik van Pienbroek - 2.21.2-2 +- The wrong RPM variable was overriden for -debuginfo support. Should be okay now + * Mon Jun 22 2009 Erik van Pienbroek - 2.21.2-1 - Update to 2.21.2 - Split out debug symbols to a -debuginfo subpackage From 46c3a7765b3b6aa37532b4df2075221b941a3da7 Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 6 Jul 2009 18:06:51 +0000 Subject: [PATCH 13/63] - Update to 2.21.3 - Drop upstreamed patch --- .cvsignore | 2 +- glib2-mingw-uih-header-compile-fix.patch | 37 ------------------------ mingw32-glib2.spec | 12 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 glib2-mingw-uih-header-compile-fix.patch diff --git a/.cvsignore b/.cvsignore index 40d1d80..d13b1fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.2.tar.bz2 +glib-2.21.3.tar.bz2 diff --git a/glib2-mingw-uih-header-compile-fix.patch b/glib2-mingw-uih-header-compile-fix.patch deleted file mode 100644 index b24090f..0000000 --- a/glib2-mingw-uih-header-compile-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sat, 20 Jun 2009 03:18:09 +0000 -Subject: Fix build on mingw - -Mingw does not have sys/uio.h. This was reported in bug 585937. - -Author: Matthias Clasen ---- -diff --git a/configure.in b/configure.in -index de0d399..d253f60 100644 ---- a/configure.in -+++ b/configure.in -@@ -857,6 +857,7 @@ AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h]) - AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h]) - AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h]) - AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h]) -+AC_CHECK_HEADERS([sys/uio.h]) - - # check for structure fields - AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) -diff --git a/gio/gsocket.c b/gio/gsocket.c -index 0670ee4..151adb5 100644 ---- a/gio/gsocket.c -+++ b/gio/gsocket.c -@@ -38,7 +38,9 @@ - # include - #endif - -+#ifdef HAVE_SYS_UIO_H - #include -+#endif - - #include "gsocket.h" - #include "gcancellable.h" --- -cgit v0.8.2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index e78c8d7..36db877 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.21.2 -Release: 2%{?dist} +Version: 2.21.3 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -16,9 +16,6 @@ URL: http://www.gtk.org Source0: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Git commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda -Patch0: glib2-mingw-uih-header-compile-fix.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 52 @@ -54,7 +51,6 @@ Static version of the MinGW Windows GLib2 library. %prep %setup -q -n glib-%{version} -%patch0 -p1 %build @@ -180,6 +176,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 6 2009 Erik van Pienbroek - 2.21.3-1 +- Update to 2.21.3 +- Drop upstreamed patch + * Mon Jun 22 2009 Erik van Pienbroek - 2.21.2-2 - The wrong RPM variable was overriden for -debuginfo support. Should be okay now diff --git a/sources b/sources index 370cd91..96e3d54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2dcb938db904efcc62757b3b0655593b glib-2.21.2.tar.bz2 +8ed8d959a131e295ce75c8ebe867014e glib-2.21.3.tar.bz2 From b4c845dafb957aafcb20bfb4783334bac3ff3a3b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 12:18:19 +0000 Subject: [PATCH 14/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 36db877..824d8c5 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.21.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 2.21.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jul 6 2009 Erik van Pienbroek - 2.21.3-1 - Update to 2.21.3 - Drop upstreamed patch From 135856139943c84156ff807c406a964a9d71fe17 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 12 Aug 2009 23:09:27 +0000 Subject: [PATCH 15/63] Update to 2.21.4 --- .cvsignore | 2 +- mingw32-glib2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d13b1fb..d5885a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.3.tar.bz2 +glib-2.21.4.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 824d8c5..a070bc8 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.21.3 -Release: 2%{?dist} +Version: 2.21.4 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek - 2.21.4-1 +- Update to 2.21.4 + * Sat Jul 25 2009 Fedora Release Engineering - 2.21.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 96e3d54..5ee117c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ed8d959a131e295ce75c8ebe867014e glib-2.21.3.tar.bz2 +5092c5b479ba80065dc164d27e63000f glib-2.21.4.tar.bz2 From 8f90c358174667836395e793ba172f51e34e67e5 Mon Sep 17 00:00:00 2001 From: epienbro Date: Thu, 27 Aug 2009 20:43:20 +0000 Subject: [PATCH 16/63] Update to 2.21.5 --- .cvsignore | 2 +- mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d5885a0..cb15d5d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.4.tar.bz2 +glib-2.21.5.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index a070bc8..85450a3 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.21.4 +Version: 2.21.5 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 24 2009 Erik van Pienbroek - 2.21.5-1 +- Update to 2.21.5 + * Thu Aug 13 2009 Erik van Pienbroek - 2.21.4-1 - Update to 2.21.4 diff --git a/sources b/sources index 5ee117c..6e3ffc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5092c5b479ba80065dc164d27e63000f glib-2.21.4.tar.bz2 +5f3f19c4a8088c51e21cad5b8ea166e5 glib-2.21.5.tar.bz2 From 39f625d828d5348e17c5effdd2b286e00c9da67a Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 5 Sep 2009 09:05:48 +0000 Subject: [PATCH 17/63] Update to 2.21.6 --- .cvsignore | 2 +- mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb15d5d..f358c8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.5.tar.bz2 +glib-2.21.6.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 85450a3..b705709 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.21.5 +Version: 2.21.6 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 5 2009 Erik van Pienbroek - 2.21.6-1 +- Update to 2.21.6 + * Mon Aug 24 2009 Erik van Pienbroek - 2.21.5-1 - Update to 2.21.5 diff --git a/sources b/sources index 6e3ffc5..fbf3381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f3f19c4a8088c51e21cad5b8ea166e5 glib-2.21.5.tar.bz2 +3b0452fbd877db53dafabdc074600cb8 glib-2.21.6.tar.bz2 From b51402d7bc08a3afbf054ec85a23dc7e94f39a18 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 18 Sep 2009 21:21:46 +0000 Subject: [PATCH 18/63] Rebuild because of broken mingw32-gcc/mingw32-binutils --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index b705709..9f50e4b 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.21.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 18 2009 Erik van Pienbroek - 2.21.6-2 +- Rebuild because of broken mingw32-gcc/mingw32-binutils + * Sat Sep 5 2009 Erik van Pienbroek - 2.21.6-1 - Update to 2.21.6 From 50d15b8e6baf2a10afb841d8fbaff4a4844258da Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 23 Sep 2009 05:12:40 +0000 Subject: [PATCH 19/63] Update to 2.22.0 --- .cvsignore | 2 +- mingw32-glib2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f358c8e..1c3a20c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.21.6.tar.bz2 +glib-2.22.0.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 9f50e4b..a9a8243 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,14 +6,14 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.21.6 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 23 2009 Erik van Pienbroek - 2.21.6-2 - Rebuild because of broken mingw32-gcc/mingw32-binutils diff --git a/sources b/sources index fbf3381..98e33d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b0452fbd877db53dafabdc074600cb8 glib-2.21.6.tar.bz2 +e0bc5b08d467cc3763550923087772d3 glib-2.22.0.tar.bz2 From 6373a74d7356f8e8b98c8dfc8a64a9aa3574fb7e Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 23 Sep 2009 05:32:25 +0000 Subject: [PATCH 20/63] Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs --- mingw32-glib2.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index a9a8243..aeec370 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT/build_static rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias +# Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs +rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb + # Remove the gtk-doc documentation and manpages which duplicate Fedora native rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc From d46b59f43d8461f6ac4901a97b716cf6159574ba Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 23 Sep 2009 12:20:37 +0000 Subject: [PATCH 21/63] Stupid typo.. --- mingw32-glib2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index aeec370..7fc6b51 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT/build_static rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias # Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs -rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb +rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb # Remove the gtk-doc documentation and manpages which duplicate Fedora native rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} From 31f667b294c7031411f177d08b6a717edb04632b Mon Sep 17 00:00:00 2001 From: epienbro Date: Thu, 8 Oct 2009 22:09:26 +0000 Subject: [PATCH 22/63] Update to 2.22.2 --- .cvsignore | 2 +- mingw32-glib2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c3a20c..6ff22de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.22.0.tar.bz2 +glib-2.22.2.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 7fc6b51..07c33b2 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.22.0 +Version: 2.22.2 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -179,7 +179,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Sep 23 2009 Erik van Pienbroek - 2.22.2-1 +- Update to 2.22.2 + +* Wed Sep 23 2009 Erik van Pienbroek - 2.22.0-1 - Update to 2.22.0 * Fri Sep 18 2009 Erik van Pienbroek - 2.21.6-2 diff --git a/sources b/sources index 98e33d4..7f5c8bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0bc5b08d467cc3763550923087772d3 glib-2.22.0.tar.bz2 +846a86c74b74d5b16826aa5508940f9b glib-2.22.2.tar.bz2 From bd1d264e27152f5501f1a474357ba721d7474c4c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:18:48 +0000 Subject: [PATCH 23/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 22defba..6ea5d10 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mingw32-glib2 -# $Id$ +# $Id: Makefile,v 1.1 2009/01/26 22:44:07 kevin Exp $ NAME := mingw32-glib2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c130e8c0fef40ac8b8becb7366c673ded4269d3c Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 2 Dec 2009 11:02:46 +0000 Subject: [PATCH 24/63] Update to 2.23.0 --- .cvsignore | 2 +- mingw32-glib2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ff22de..03a90a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.22.2.tar.bz2 +glib-2.23.0.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 07c33b2..9fa853a 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,14 +6,14 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.22.2 +Version: 2.23.0 Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 2 2009 Erik van Pienbroek - 2.23.0-1 +- Update to 2.23.0 + * Fri Oct 9 2009 Erik van Pienbroek - 2.22.2-1 - Update to 2.22.2 diff --git a/sources b/sources index 7f5c8bb..f782733 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -846a86c74b74d5b16826aa5508940f9b glib-2.22.2.tar.bz2 +75909517629c54e5c5b36d8e233915a9 glib-2.23.0.tar.bz2 From 80b1ed2aa335d76dc7acf49c75fa7fa3d97e2aa2 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 2 Dec 2009 11:13:37 +0000 Subject: [PATCH 25/63] Added BR: mingw32-zlib --- mingw32-glib2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 9fa853a..8c02143 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -24,6 +24,7 @@ BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-iconv BuildRequires: mingw32-gettext +BuildRequires: mingw32-zlib BuildRequires: pkgconfig # Native version required for msgfmt use in build @@ -181,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Dec 2 2009 Erik van Pienbroek - 2.23.0-1 - Update to 2.23.0 +- Added BR: mingw32-zlib * Fri Oct 9 2009 Erik van Pienbroek - 2.22.2-1 - Update to 2.22.2 From ff2816eb6d5746d06e6f08a6219aef96b75c6488 Mon Sep 17 00:00:00 2001 From: sailer Date: Sun, 31 Jan 2010 16:32:23 +0000 Subject: [PATCH 26/63] update to 2.23.2, to match native --- .cvsignore | 1 + mingw32-glib2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 03a90a6..269c7fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ glib-2.23.0.tar.bz2 +glib-2.23.2.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 8c02143..d6fbf8c 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.23.0 +Version: 2.23.2 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -134,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/glib-gettextize %{_mingw32_bindir}/glib-mkenums %{_mingw32_bindir}/gobject-query.exe +%{_mingw32_bindir}/gio-querymodules.exe %{_mingw32_bindir}/gspawn-win32-helper-console.exe %{_mingw32_bindir}/gspawn-win32-helper.exe %{_mingw32_bindir}/libgio-2.0-0.dll @@ -159,7 +160,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.dll.a %{_mingw32_libdir}/libgthread-2.0.la %{_mingw32_libdir}/pkgconfig/gio-2.0.pc -%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc %{_mingw32_libdir}/pkgconfig/glib-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 31 2010 Thomas Sailer - 2.23.2-1 +- Update to 2.23.2 + * Wed Dec 2 2009 Erik van Pienbroek - 2.23.0-1 - Update to 2.23.0 - Added BR: mingw32-zlib diff --git a/sources b/sources index f782733..dbeb5e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75909517629c54e5c5b36d8e233915a9 glib-2.23.0.tar.bz2 +5613fadc27b1cb64f234aed4babfa17b glib-2.23.2.tar.bz2 From e76b50aa4da562e156584b92c6af9ce3a0a5293c Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 24 Feb 2010 19:44:59 +0000 Subject: [PATCH 27/63] Update to 2.23.4 --- .cvsignore | 3 +-- mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 269c7fb..3c6a72c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -glib-2.23.0.tar.bz2 -glib-2.23.2.tar.bz2 +glib-2.23.4.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index d6fbf8c..cfb6a86 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.23.2 +Version: 2.23.4 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 24 2010 Erik van Pienbroek - 2.23.4-1 +- Update to 2.23.4 + * Sun Jan 31 2010 Thomas Sailer - 2.23.2-1 - Update to 2.23.2 diff --git a/sources b/sources index dbeb5e6..cc34688 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5613fadc27b1cb64f234aed4babfa17b glib-2.23.2.tar.bz2 +9cba5ad06e1ddb603a3a893e5cd1f528 glib-2.23.4.tar.bz2 From 107b0676e6c90022cd20b6a2b5e10dba7dc48039 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 11 Jun 2010 21:46:48 +0000 Subject: [PATCH 28/63] Update to 2.24.1 --- .cvsignore | 2 +- mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c6a72c..d2b5651 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.23.4.tar.bz2 +glib-2.24.1.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index cfb6a86..46c49cb 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.23.4 +Version: 2.24.1 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 11 2010 Erik van Pienbroek - 2.24.1-1 +- Update to 2.24.1 + * Wed Feb 24 2010 Erik van Pienbroek - 2.23.4-1 - Update to 2.23.4 diff --git a/sources b/sources index cc34688..c1356b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cba5ad06e1ddb603a3a893e5cd1f528 glib-2.23.4.tar.bz2 +6a7db81c9a2cffe6a34dadb57d7ba2d2 glib-2.24.1.tar.bz2 From cb0ccc76992115c2c1211cbf4bbe3839fc2a6d64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:19:40 +0000 Subject: [PATCH 29/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6ea5d10..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mingw32-glib2 -# $Id: Makefile,v 1.1 2009/01/26 22:44:07 kevin Exp $ -NAME := mingw32-glib2 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index bb8b3f9..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -mingw32-glib2-2_19_5-2_fc11:HEAD:mingw32-glib2-2.19.5-2.fc11.src.rpm:1233143135 From 29d48f75a33861479f7167b9463e93ffb45e2dcf Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 5 Aug 2010 11:17:45 +0200 Subject: [PATCH 30/63] update to 2.25.12 --- .gitignore | 1 + mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2b5651..ad89b96 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ glib-2.24.1.tar.bz2 +glib-2.25.12.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 46c49cb..602d3e7 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.24.1 +Version: 2.25.12 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 5 2010 Thomas Sailer - 2.25.12-1 +- update to 2.25.12 + * Fri Jun 11 2010 Erik van Pienbroek - 2.24.1-1 - Update to 2.24.1 diff --git a/sources b/sources index c1356b7..05e0616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a7db81c9a2cffe6a34dadb57d7ba2d2 glib-2.24.1.tar.bz2 +c709d78fb794e0ec2090cd41dfee244a glib-2.25.12.tar.bz2 From b9883becdd96c42e461d9485bf322dee9f27d0f8 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 11 Aug 2010 17:49:28 -0400 Subject: [PATCH 31/63] recompiling .py files against Python 2.7 (rhbz#623338) --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 602d3e7..e82a7c9 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.25.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 11 2010 David Malcolm - 2.25.12-2 +- recompiling .py files against Python 2.7 (rhbz#623338) + * Thu Aug 5 2010 Thomas Sailer - 2.25.12-1 - update to 2.25.12 From f0449a1c864a73f3c79506fc351973f35fa5ca35 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 12 Sep 2010 17:25:40 +0200 Subject: [PATCH 32/63] Update to 2.25.15 --- .gitignore | 1 + mingw32-glib2.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ad89b96..0d1a2bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ glib-2.24.1.tar.bz2 glib-2.25.12.tar.bz2 +/glib-2.25.15.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index e82a7c9..c92be3d 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,14 +6,14 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.25.12 -Release: 2%{?dist} +Version: 2.25.15 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.25/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc +# Bash-completion files aren't interesting for mingw32 +rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d + %find_lang glib20 @@ -130,11 +133,14 @@ rm -rf $RPM_BUILD_ROOT %files -f glib20.lang %defattr(-,root,root,-) +%{_mingw32_bindir}/gdbus.exe +%{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe %{_mingw32_bindir}/glib-gettextize %{_mingw32_bindir}/glib-mkenums %{_mingw32_bindir}/gobject-query.exe %{_mingw32_bindir}/gio-querymodules.exe +%{_mingw32_bindir}/gsettings.exe %{_mingw32_bindir}/gspawn-win32-helper-console.exe %{_mingw32_bindir}/gspawn-win32-helper.exe %{_mingw32_bindir}/libgio-2.0-0.dll @@ -143,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgobject-2.0-0.dll %{_mingw32_bindir}/libgthread-2.0-0.dll %{_mingw32_includedir}/glib-2.0/ +%{_mingw32_includedir}/gio-win32-2.0/ %{_mingw32_libdir}/gio-2.0.def %{_mingw32_libdir}/glib-2.0.def %{_mingw32_libdir}/glib-2.0/ @@ -160,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.dll.a %{_mingw32_libdir}/libgthread-2.0.la %{_mingw32_libdir}/pkgconfig/gio-2.0.pc +%{_mingw32_libdir}/pkgconfig/gio-windows-2.0.pc %{_mingw32_libdir}/pkgconfig/glib-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc @@ -168,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/pkgconfig/gthread-2.0.pc %{_mingw32_datadir}/aclocal/glib-2.0.m4 %{_mingw32_datadir}/aclocal/glib-gettext.m4 +%{_mingw32_datadir}/aclocal/gsettings.m4 %{_mingw32_datadir}/glib-2.0/ %files static @@ -180,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 12 2010 Erik van Pienbroek - 2.25.15-1 +- Update to 2.25.15 + * Wed Aug 11 2010 David Malcolm - 2.25.12-2 - recompiling .py files against Python 2.7 (rhbz#623338) diff --git a/sources b/sources index 05e0616..fda57a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c709d78fb794e0ec2090cd41dfee244a glib-2.25.12.tar.bz2 +cbcca065bd20e37b2c633725934b8b06 glib-2.25.15.tar.bz2 From f700c1ff0f4afbcce44ddc56b02211cf3ff44ccf Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 24 Sep 2010 00:08:16 +0200 Subject: [PATCH 33/63] Update to 2.25.17 --- .gitignore | 1 + mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d1a2bc..5ff245b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ glib-2.24.1.tar.bz2 glib-2.25.12.tar.bz2 /glib-2.25.15.tar.bz2 +/glib-2.25.17.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index c92be3d..a73b921 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.25.15 +Version: 2.25.17 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 23 2010 Erik van Pienbroek - 2.25.17-1 +- Update to 2.25.17 + * Sun Sep 12 2010 Erik van Pienbroek - 2.25.15-1 - Update to 2.25.15 diff --git a/sources b/sources index fda57a0..6f799f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbcca065bd20e37b2c633725934b8b06 glib-2.25.15.tar.bz2 +335c448c05cff9c296b37f47eb019f3a glib-2.25.17.tar.bz2 From 0021369e29abd673a876fb2418a41bfc482fede6 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 12 Oct 2010 00:20:57 +0200 Subject: [PATCH 34/63] Update to 2.26.0 --- .gitignore | 1 + mingw32-glib2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ff245b..517f9c0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ glib-2.24.1.tar.bz2 glib-2.25.12.tar.bz2 /glib-2.25.15.tar.bz2 /glib-2.25.17.tar.bz2 +/glib-2.26.0.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index a73b921..08942ef 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,14 +6,14 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.25.17 +Version: 2.26.0 Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.25/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.26/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -47,7 +47,7 @@ Group: Development/Libraries Static version of the MinGW Windows GLib2 library. -%{_mingw32_debug_package} +%{?_mingw32_debug_package} %prep @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 11 2010 Erik van Pienbroek - 2.26.0-1 +- Update to 2.26.0 + * Thu Sep 23 2010 Erik van Pienbroek - 2.25.17-1 - Update to 2.25.17 diff --git a/sources b/sources index 6f799f7..b7badb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -335c448c05cff9c296b37f47eb019f3a glib-2.25.17.tar.bz2 +9b7dc61f5e389e1cff277a6350c37397 glib-2.26.0.tar.bz2 From 18bfafeb53880f48128cdd3cc428f026f8841659 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 16 Oct 2010 17:38:17 +0200 Subject: [PATCH 35/63] Rebuild in order to make libintl-8.dll a soft dependency --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 08942ef..b2494e5 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 16 2010 Erik van Pienbroek - 2.26.0-2 +- Rebuild in order to make libintl-8.dll a soft dependency + * Mon Oct 11 2010 Erik van Pienbroek - 2.26.0-1 - Update to 2.26.0 From 21cc61df3170c4eab77ef0609d11d0765f01a484 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 16 Oct 2010 17:55:39 +0200 Subject: [PATCH 36/63] Make sure that libtool doesn't complain that it can't find the 'real file for library -lintl' --- mingw32-glib2.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index b2494e5..5b97a64 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -34,6 +34,11 @@ BuildRequires: glib2-devel Requires: pkgconfig +# As we're using libproxy-intl the libintl-8.dll dependency is a soft one +# To compile applications against glib2 we need to have gettext installed +# for it's headers +Requires: mingw32-gettext + %description MinGW Windows Glib2 library. @@ -55,6 +60,10 @@ Static version of the MinGW Windows GLib2 library. %build +# Make sure that libtool doesn't complain that it can't find +# the 'real file for library -lintl' +export lt_cv_deplibs_check_method="pass_all" + # GLib can't build static and shared libraries in one go, so we # build GLib twice here mkdir build_static From a6da1d27e50787bb1495873ba554d31154801cc9 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 17 Oct 2010 01:43:30 +0200 Subject: [PATCH 37/63] Let binaries depending on GLib link against the libintl wrapper library in a way that libtool doesn't refuse --- mingw32-glib2.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 5b97a64..ef7de51 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -133,6 +133,13 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc # Bash-completion files aren't interesting for mingw32 rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d +# The libtool files refer to libintl while they shouldn't +# Drop this reference manually +find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \; + +# Let binaries depending on GLib link against the libintl wrapper library 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'@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la + %find_lang glib20 @@ -198,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 17 2010 Erik van Pienbroek - 2.26.0-3 +- Let binaries depending on GLib link against the libintl wrapper library + in a way that libtool doesn't refuse + * Sat Oct 16 2010 Erik van Pienbroek - 2.26.0-2 - Rebuild in order to make libintl-8.dll a soft dependency From 2f3bba8b2f4540da707a58bb4feb3b05db89ced6 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 7 Nov 2010 16:28:42 +0100 Subject: [PATCH 38/63] Fix a build failure in mingw32-libsoup and mingw32-webkitgtk --- mingw32-glib2.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index ef7de51..63c76e5 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.26.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -137,8 +137,13 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d # Drop this reference manually find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \; -# Let binaries depending on GLib link against the libintl wrapper library 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'@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la +# 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 +sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw64_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw64_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 +sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw64_libdir}/pkgconfig/glib-2.0.pc %find_lang glib20 @@ -205,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 7 2010 Erik van Pienbroek - 2.26.0-4 +- Fix a build failure in mingw32-libsoup and mingw32-webkitgtk + * Sun Oct 17 2010 Erik van Pienbroek - 2.26.0-3 - Let binaries depending on GLib link against the libintl wrapper library in a way that libtool doesn't refuse From 2e2670266f9eaf91b9da305164df64af24a7fd7e Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 7 Nov 2010 16:37:21 +0100 Subject: [PATCH 39/63] Dropped the mingw64 macros as Fedora doesn't have mingw64 support yet --- mingw32-glib2.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 63c76e5..1d5ccd2 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -139,11 +139,9 @@ 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 -sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw64_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw64_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 -sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw64_libdir}/pkgconfig/glib-2.0.pc %find_lang glib20 From 90088819fe28dbdca95b47208fb909a0d72f81de Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Mon, 6 Dec 2010 17:54:30 +0100 Subject: [PATCH 40/63] update to 2.27.4 --- .gitignore | 1 + mingw32-glib2.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad89b96..737cf33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ glib-2.24.1.tar.bz2 glib-2.25.12.tar.bz2 +/glib-2.27.4.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 602d3e7..d89689c 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.25.12 +Version: 2.27.4 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -60,12 +60,16 @@ Static version of the MinGW Windows GLib2 library. mkdir build_static pushd build_static %{_mingw32_configure} --disable-shared --enable-static + # HACK + cp glib/glibconfig.h ../glib make %{?_smp_mflags} popd mkdir build_shared pushd build_shared %{_mingw32_configure} --disable-static + # HACK + cp glib/glibconfig.h ../glib make %{?_smp_mflags} popd @@ -180,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 6 2010 Thomas Sailer - 2.27.4-1 +- update to 2.27.4 + * Thu Aug 5 2010 Thomas Sailer - 2.25.12-1 - update to 2.25.12 diff --git a/sources b/sources index 05e0616..9f53b4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c709d78fb794e0ec2090cd41dfee244a glib-2.25.12.tar.bz2 +b6f67a6b1c4792edd58411f9e6e3a6fb glib-2.27.4.tar.bz2 From 14877c8031611b4e77bec27ea7ec49e9aa072dac Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 12 Jan 2011 17:54:03 +0100 Subject: [PATCH 41/63] fix source URL --- mingw32-glib2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 00d58ce..b13416d 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -13,7 +13,7 @@ Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.26/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.27/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From e7486a00d780325e9eabf9940b620c4c80ef97c3 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 12 Jan 2011 21:57:59 +0100 Subject: [PATCH 42/63] from gtkmm30.spec, via Kalev Lember, automatically adjust release version --- mingw32-glib2.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index b13416d..65bfd97 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -13,7 +13,9 @@ Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.27/glib-%{version}.tar.bz2 +# first two digits of version +%define release_version %(echo %{version} | awk -F. '{print $1"."$2}') +Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From 84b500544d0c8984f6cb986150e5d9760186a5ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:31:52 -0600 Subject: [PATCH 43/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 65bfd97..086acf0 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.27.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.27.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Dec 6 2010 Thomas Sailer - 2.27.4-1 - update to 2.27.4 From 3f92a4eb88cfa7703f147063b99804ba5a775078 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Sun, 13 Feb 2011 17:52:09 +0100 Subject: [PATCH 44/63] update to 2.27.93 --- .gitignore | 1 + mingw32-glib2.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 50b4d6e..ffeadbf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ glib-2.27.4.tar.bz2 glib-2.25.15.tar.bz2 glib-2.25.17.tar.bz2 glib-2.26.0.tar.bz2 +/glib-2.28.0.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 086acf0..1c83fe2 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.27.4 -Release: 2%{?dist} +Version: 2.27.93 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -73,6 +73,8 @@ pushd build_static %{_mingw32_configure} --disable-shared --enable-static # HACK cp glib/glibconfig.h ../glib + # evil Hack + 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 make %{?_smp_mflags} popd @@ -81,6 +83,8 @@ pushd build_shared %{_mingw32_configure} --disable-static # HACK cp glib/glibconfig.h ../glib + # evil Hack + 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 make %{?_smp_mflags} popd @@ -214,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 13 2011 Thomas Sailer - 2.27.93-1 +- update to 2.27.93 + * Tue Feb 08 2011 Fedora Release Engineering - 2.27.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 9f53b4e..24db0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6f67a6b1c4792edd58411f9e6e3a6fb glib-2.27.4.tar.bz2 +73954628c437408c189d62670a7032f7 glib-2.27.93.tar.bz2 From 9511343f90de2b59bdb53754514d45431ea2c845 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Sun, 13 Feb 2011 18:13:11 +0100 Subject: [PATCH 45/63] hack the hack to work on 32 and 64bit builders --- mingw32-glib2.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 1c83fe2..3d26aea 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -74,7 +74,11 @@ pushd build_static # HACK cp glib/glibconfig.h ../glib # evil Hack - 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 + 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 @@ -84,7 +88,11 @@ pushd build_shared # HACK cp glib/glibconfig.h ../glib # evil Hack - 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 + 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 From f59730eadd03dbf6530612e46a7fc7952836f662 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Sun, 13 Feb 2011 18:14:31 +0100 Subject: [PATCH 46/63] update to 2.28.0 --- .gitignore | 3 ++- mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ffeadbf..633acfa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ glib-2.27.4.tar.bz2 glib-2.25.15.tar.bz2 glib-2.25.17.tar.bz2 glib-2.26.0.tar.bz2 -/glib-2.28.0.tar.bz2 +glib-2.28.0.tar.bz2 +glib-2.27.93.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 1c83fe2..e2357f3 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.27.93 +Version: 2.28.0 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 13 2011 Thomas Sailer - 2.28.0-1 +- update to 2.28.0 + * Sun Feb 13 2011 Thomas Sailer - 2.27.93-1 - update to 2.27.93 diff --git a/sources b/sources index 24db0ea..dde5d67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73954628c437408c189d62670a7032f7 glib-2.27.93.tar.bz2 +51dbe36bc03a29a1f9bf6b74fb4a6926 glib-2.28.0.tar.bz2 From 34e8dba905d097d340de47949e2005382ba5d869 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 23 Apr 2011 13:27:58 +0200 Subject: [PATCH 47/63] 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 From 04e4ad78a551fef6fa24f08b6f93a7b71628b502 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 27 Apr 2011 19:14:51 +0200 Subject: [PATCH 48/63] Dropped the proxy-libintl pieces --- mingw32-glib2.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index ede6b5c..33257dc 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.28.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -62,10 +62,6 @@ Static version of the MinGW Windows GLib2 library. %build -# Make sure that libtool doesn't complain that it can't find -# the 'real file for library -lintl' -export lt_cv_deplibs_check_method="pass_all" - # GLib can't build static and shared libraries in one go, so we # build GLib twice here mkdir build_static @@ -139,16 +135,6 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc # Bash-completion files aren't interesting for mingw32 rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d -# The libtool files refer to libintl while they shouldn't -# Drop this reference manually -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 - -# 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 @@ -214,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 27 2011 Erik van Pienbroek - 2.28.6-2 +- Dropped the proxy-libintl pieces + * 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 From 8e8b351bbb0a3849d4ba143bd25cecdebe158485 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 28 Apr 2011 12:07:14 +0200 Subject: [PATCH 49/63] Own the folders %{_mingw32_libdir}/gio and %{_mingw32_libdir}/gio/modules - Own the folders %{_mingw32_libdir}/gio and %{_mingw32_libdir}/gio/modules - Dropped the .def files as they aren't useful for other binaries --- mingw32-glib2.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 33257dc..81aea75 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.28.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc # Bash-completion files aren't interesting for mingw32 rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d +# The .def files are also of no use to other binaries +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def + %find_lang glib20 @@ -161,12 +164,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgthread-2.0-0.dll %{_mingw32_includedir}/glib-2.0/ %{_mingw32_includedir}/gio-win32-2.0/ -%{_mingw32_libdir}/gio-2.0.def -%{_mingw32_libdir}/glib-2.0.def %{_mingw32_libdir}/glib-2.0/ -%{_mingw32_libdir}/gmodule-2.0.def -%{_mingw32_libdir}/gobject-2.0.def -%{_mingw32_libdir}/gthread-2.0.def +%dir %{_mingw32_libdir}/gio/ +%dir %{_mingw32_libdir}/gio/modules/ %{_mingw32_libdir}/libgio-2.0.dll.a %{_mingw32_libdir}/libgio-2.0.la %{_mingw32_libdir}/libglib-2.0.dll.a @@ -200,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 28 2011 Erik van Pienbroek - 2.28.6-3 +- Own the folders %%{_mingw32_libdir}/gio and %%{_mingw32_libdir}/gio/modules +- Dropped the .def files as they aren't useful for other binaries + * Wed Apr 27 2011 Erik van Pienbroek - 2.28.6-2 - Dropped the proxy-libintl pieces From ceeb044d9840777a9904bf3671ce51eab8dacb93 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 6 Jul 2011 20:26:02 +0300 Subject: [PATCH 50/63] Rebuilt against win-iconv --- mingw32-glib2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 81aea75..ce01b85 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.28.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -24,7 +24,7 @@ BuildRequires: mingw32-filesystem >= 52 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn -BuildRequires: mingw32-iconv +BuildRequires: mingw32-win-iconv BuildRequires: mingw32-gettext BuildRequires: mingw32-zlib @@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 06 2011 Kalev Lember - 2.28.6-4 +- Rebuilt against win-iconv + * Thu Apr 28 2011 Erik van Pienbroek - 2.28.6-3 - Own the folders %%{_mingw32_libdir}/gio and %%{_mingw32_libdir}/gio/modules - Dropped the .def files as they aren't useful for other binaries From cf8df0ed8028c75192ca0e0b6de63edfe0d59fdb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 10 Jul 2011 13:43:43 +0300 Subject: [PATCH 51/63] Update to 2.29.10 - Switch to xz compressed tarballs --- .gitignore | 1 + mingw32-glib2.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a5eb804..c441b36 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ glib-2.26.0.tar.bz2 glib-2.28.0.tar.bz2 glib-2.27.93.tar.bz2 /glib-2.28.6.tar.bz2 +/glib-2.29.10.tar.xz diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index ce01b85..372bd99 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.28.6 -Release: 4%{?dist} +Version: 2.29.10 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -15,7 +15,7 @@ Group: Development/Libraries URL: http://www.gtk.org # first two digits of version %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') -Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +26,7 @@ BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-win-iconv BuildRequires: mingw32-gettext +BuildRequires: mingw32-libffi BuildRequires: mingw32-zlib BuildRequires: pkgconfig @@ -147,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT %files -f glib20.lang %defattr(-,root,root,-) +%{_mingw32_bindir}/gdbus-codegen %{_mingw32_bindir}/gdbus.exe %{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe @@ -164,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgthread-2.0-0.dll %{_mingw32_includedir}/glib-2.0/ %{_mingw32_includedir}/gio-win32-2.0/ +%{_mingw32_libdir}/gdbus-codegen/ %{_mingw32_libdir}/glib-2.0/ %dir %{_mingw32_libdir}/gio/ %dir %{_mingw32_libdir}/gio/modules/ @@ -200,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 08 2011 Kalev Lember - 2.29.10-1 +- Update to 2.29.10 +- Switch to xz compressed tarballs + * Wed Jul 06 2011 Kalev Lember - 2.28.6-4 - Rebuilt against win-iconv diff --git a/sources b/sources index 8de68dd..aaab47e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d8fc15ae70d5111c0cf2a79d50ef717 glib-2.28.6.tar.bz2 +4c9a83a1c476352f4889514521042861 glib-2.29.10.tar.xz From 67bdbcfe89bcf0e8151a76d6023400f52b070bdf Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 10 Jul 2011 13:12:36 +0200 Subject: [PATCH 52/63] Dropped the gdbus-codegen pieces as they match the native glib2 package --- mingw32-glib2.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 372bd99..959cea9 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -7,7 +7,7 @@ Name: mingw32-glib2 Version: 2.29.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -139,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d # The .def files are also of no use to other binaries rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def +# The gdbus-codegen pieces are already in the native glib2 package +rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/gdbus-codegen +rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-codegen + %find_lang glib20 @@ -148,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT %files -f glib20.lang %defattr(-,root,root,-) -%{_mingw32_bindir}/gdbus-codegen %{_mingw32_bindir}/gdbus.exe %{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe @@ -166,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgthread-2.0-0.dll %{_mingw32_includedir}/glib-2.0/ %{_mingw32_includedir}/gio-win32-2.0/ -%{_mingw32_libdir}/gdbus-codegen/ %{_mingw32_libdir}/glib-2.0/ %dir %{_mingw32_libdir}/gio/ %dir %{_mingw32_libdir}/gio/modules/ @@ -203,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 10 2011 Erik van Pienbroek - 2.29.10-2 +- Dropped the gdbus-codegen pieces as they match the native glib2 package + * Fri Jul 08 2011 Kalev Lember - 2.29.10-1 - Update to 2.29.10 - Switch to xz compressed tarballs From 359571c344d0d04f95c2ec3ec88efe33f67f74bf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 30 Aug 2011 21:10:22 +0300 Subject: [PATCH 53/63] Update to 2.29.18 --- .gitignore | 1 + mingw32-glib2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c441b36..75caaf1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ glib-2.28.0.tar.bz2 glib-2.27.93.tar.bz2 /glib-2.28.6.tar.bz2 /glib-2.29.10.tar.xz +/glib-2.29.18.tar.xz diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 959cea9..c958901 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.29.10 -Release: 2%{?dist} +Version: 2.29.18 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -141,7 +141,7 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def # The gdbus-codegen pieces are already in the native glib2 package rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/gdbus-codegen -rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-codegen +rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %find_lang glib20 @@ -205,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 30 2011 Kalev Lember - 2.29.18-1 +- Update to 2.29.18 + * Sun Jul 10 2011 Erik van Pienbroek - 2.29.10-2 - Dropped the gdbus-codegen pieces as they match the native glib2 package diff --git a/sources b/sources index aaab47e..2a3ef1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c9a83a1c476352f4889514521042861 glib-2.29.10.tar.xz +2ac3df9236116d40ec23b28a44635e65 glib-2.29.18.tar.xz From b60b6dbe943ec6455af2560c1786936fd2da722f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 30 Aug 2011 21:11:27 +0300 Subject: [PATCH 54/63] Clean up spec from cruft not needed with modern rpmbuild --- mingw32-glib2.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index c958901..7b1e39b 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -1,8 +1,5 @@ %global __strip %{_mingw32_strip} %global __objdump %{_mingw32_objdump} -%global _use_internal_dependency_generator 0 -%global __find_requires %{_mingw32_findrequires} -%global __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 @@ -16,11 +13,10 @@ URL: http://www.gtk.org # first two digits of version %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 52 +BuildRequires: mingw32-filesystem >= 68 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -83,8 +79,6 @@ popd %install -rm -rf $RPM_BUILD_ROOT - # First install all the files belonging to the shared build make -C build_shared DESTDIR=$RPM_BUILD_ROOT install @@ -146,12 +140,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %find_lang glib20 -%clean -rm -rf $RPM_BUILD_ROOT - - %files -f glib20.lang -%defattr(-,root,root,-) %{_mingw32_bindir}/gdbus.exe %{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe @@ -196,7 +185,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/glib-2.0/ %files static -%defattr(-,root,root,-) %{_mingw32_libdir}/libgio-2.0.a %{_mingw32_libdir}/libglib-2.0.a %{_mingw32_libdir}/libgmodule-2.0.a From a8afec944bd7f1d167d2160c3c3bab49661abc96 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 30 Sep 2011 18:52:26 +0300 Subject: [PATCH 55/63] Update to 2.30.0 --- .gitignore | 1 + mingw32-glib2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75caaf1..6ccbc88 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ glib-2.27.93.tar.bz2 /glib-2.28.6.tar.bz2 /glib-2.29.10.tar.xz /glib-2.29.18.tar.xz +/glib-2.30.0.tar.xz diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 7b1e39b..6e1e787 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.29.18 +Version: 2.30.0 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Fri Sep 30 2011 Kalev Lember - 2.30.0-1 +- Update to 2.30.0 + * Tue Aug 30 2011 Kalev Lember - 2.29.18-1 - Update to 2.29.18 diff --git a/sources b/sources index 2a3ef1a..2f558bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ac3df9236116d40ec23b28a44635e65 glib-2.29.18.tar.xz +68ac9516233044f27e76577d4f4e6de9 glib-2.30.0.tar.xz From b7695a6b6357dfc7fe0ef39e18d423b6c80752a5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 18 Oct 2011 19:08:10 +0300 Subject: [PATCH 56/63] Use wildcards in .gitignore --- .gitignore | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6ccbc88..590a15d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -glib-2.24.1.tar.bz2 -glib-2.25.12.tar.bz2 -glib-2.27.4.tar.bz2 -glib-2.25.15.tar.bz2 -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 -/glib-2.29.10.tar.xz -/glib-2.29.18.tar.xz -/glib-2.30.0.tar.xz +/glib-*.tar.xz From 4eb215e8cebc238cb3d0a6dcd131ac0b213b2c9b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 18 Oct 2011 19:10:48 +0300 Subject: [PATCH 57/63] Clean up old BuildRequires / Requires --- mingw32-glib2.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 6e1e787..1a00cc1 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -25,20 +25,11 @@ BuildRequires: mingw32-gettext BuildRequires: mingw32-libffi BuildRequires: mingw32-zlib -BuildRequires: pkgconfig # Native version required for msgfmt use in build BuildRequires: gettext # Native version required for glib-genmarshal BuildRequires: glib2-devel -Requires: pkgconfig - -# As we're using libproxy-intl the libintl-8.dll dependency is a soft one -# To compile applications against glib2 we need to have gettext installed -# for it's headers -Requires: mingw32-gettext - - %description MinGW Windows Glib2 library. From ff8b72f5596e89cb4432387d3fa24d39b39c7b14 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 18 Oct 2011 19:11:21 +0300 Subject: [PATCH 58/63] Update to 2.30.1 --- mingw32-glib2.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 1a00cc1..e54cc9e 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.30.0 +Version: 2.30.1 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Tue Oct 18 2011 Kalev Lember - 2.30.1-1 +- Update to 2.30.1 + * Fri Sep 30 2011 Kalev Lember - 2.30.0-1 - Update to 2.30.0 diff --git a/sources b/sources index 2f558bf..790152c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68ac9516233044f27e76577d4f4e6de9 glib-2.30.0.tar.xz +1954dca69994fb8f60280341da3fe2ae glib-2.30.1.tar.xz From 4f17a51fe12f8548c5aff92fdf3871f7a4367765 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 23 Nov 2011 00:57:16 +0100 Subject: [PATCH 59/63] Update to 2.31.2 --- glib-2.31.2-fix-win32-compilation.patch | 16 ++++++++++++++++ mingw32-glib2.spec | 9 ++++++++- sources | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 glib-2.31.2-fix-win32-compilation.patch diff --git a/glib-2.31.2-fix-win32-compilation.patch b/glib-2.31.2-fix-win32-compilation.patch new file mode 100644 index 0000000..97d8149 --- /dev/null +++ b/glib-2.31.2-fix-win32-compilation.patch @@ -0,0 +1,16 @@ +--- glib/tests/mainloop.c.orig 2011-11-23 00:31:39.033277898 +0100 ++++ glib/tests/mainloop.c 2011-11-23 00:32:50.079792796 +0100 +@@ -22,9 +22,12 @@ + + #include + #include +-#include + #include + ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++ + static gboolean cb (gpointer data) + { + return FALSE; diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index e54cc9e..9d96049 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.30.1 +Version: 2.31.2 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -14,6 +14,9 @@ URL: http://www.gtk.org %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=664559 +Patch0: glib-2.31.2-fix-win32-compilation.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 68 @@ -47,6 +50,7 @@ Static version of the MinGW Windows GLib2 library. %prep %setup -q -n glib-%{version} +%patch0 -p0 %build @@ -184,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Tue Nov 22 2011 Erik van Pienbroek - 2.31.2-1 +- Update to 2.31.2 + * Tue Oct 18 2011 Kalev Lember - 2.30.1-1 - Update to 2.30.1 diff --git a/sources b/sources index 790152c..a960e2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1954dca69994fb8f60280341da3fe2ae glib-2.30.1.tar.xz +1cbdf314d7c87916a0c3dce83ac0285f glib-2.31.2.tar.xz From ab255d4d633a395336eb62d2b5de1da7bfd5ff12 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 12 Jan 2012 21:58:53 +0100 Subject: [PATCH 60/63] Update to 2.31.8 --- glib-2.31.2-fix-win32-compilation.patch | 16 ---------------- mingw32-glib2.spec | 9 ++++----- sources | 2 +- 3 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 glib-2.31.2-fix-win32-compilation.patch diff --git a/glib-2.31.2-fix-win32-compilation.patch b/glib-2.31.2-fix-win32-compilation.patch deleted file mode 100644 index 97d8149..0000000 --- a/glib-2.31.2-fix-win32-compilation.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- glib/tests/mainloop.c.orig 2011-11-23 00:31:39.033277898 +0100 -+++ glib/tests/mainloop.c 2011-11-23 00:32:50.079792796 +0100 -@@ -22,9 +22,12 @@ - - #include - #include --#include - #include - -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+ - static gboolean cb (gpointer data) - { - return FALSE; diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 9d96049..485774b 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.31.2 +Version: 2.31.8 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -14,9 +14,6 @@ URL: http://www.gtk.org %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=664559 -Patch0: glib-2.31.2-fix-win32-compilation.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 68 @@ -50,7 +47,6 @@ Static version of the MinGW Windows GLib2 library. %prep %setup -q -n glib-%{version} -%patch0 -p0 %build @@ -188,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Thu Jan 12 2012 Erik van Pienbroek - 2.31.8-1 +- Update to 2.31.8 + * Tue Nov 22 2011 Erik van Pienbroek - 2.31.2-1 - Update to 2.31.2 diff --git a/sources b/sources index a960e2d..1a9e5aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cbdf314d7c87916a0c3dce83ac0285f glib-2.31.2.tar.xz +6909664f29fae2f00cc3181c8c6a6aa7 glib-2.31.8.tar.xz From 1054f51f6ab4fcced47322060176818f7cc6a834 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Feb 2012 02:05:41 +0200 Subject: [PATCH 61/63] Update to 2.31.16 --- mingw32-glib2.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 485774b..df738f3 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.31.8 +Version: 2.31.16 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -28,7 +28,7 @@ BuildRequires: mingw32-zlib # Native version required for msgfmt use in build BuildRequires: gettext # Native version required for glib-genmarshal -BuildRequires: glib2-devel +BuildRequires: glib2-devel >= 2.31.14 %description MinGW Windows Glib2 library. @@ -133,12 +133,14 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %files -f glib20.lang %{_mingw32_bindir}/gdbus.exe +%{_mingw32_bindir}/gio-querymodules.exe +%{_mingw32_bindir}/glib-compile-resources.exe %{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe %{_mingw32_bindir}/glib-gettextize %{_mingw32_bindir}/glib-mkenums %{_mingw32_bindir}/gobject-query.exe -%{_mingw32_bindir}/gio-querymodules.exe +%{_mingw32_bindir}/gresource.exe %{_mingw32_bindir}/gsettings.exe %{_mingw32_bindir}/gspawn-win32-helper-console.exe %{_mingw32_bindir}/gspawn-win32-helper.exe @@ -184,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Tue Feb 07 2012 Kalev Lember - 2.31.16-1 +- Update to 2.31.16 + * Thu Jan 12 2012 Erik van Pienbroek - 2.31.8-1 - Update to 2.31.8 diff --git a/sources b/sources index 1a9e5aa..709f55d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6909664f29fae2f00cc3181c8c6a6aa7 glib-2.31.8.tar.xz +49b8c1fbf84de3fe3ef31e9ca8ccefbb glib-2.31.16.tar.xz From 9e623840a0143f00a6bbfac500cda17f8dd871b6 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Feb 2012 23:29:53 +0100 Subject: [PATCH 62/63] Rebuild against the mingw-w64 toolchain --- mingw32-glib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index df738f3..64de048 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -4,7 +4,7 @@ Name: mingw32-glib2 Version: 2.31.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Mon Feb 27 2012 Erik van Pienbroek - 2.31.16-2 +- Rebuild against the mingw-w64 toolchain + * Tue Feb 07 2012 Kalev Lember - 2.31.16-1 - Update to 2.31.16 From 48942e189698af191fb062e50e3eb98e863c5b4e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 28 Feb 2012 14:42:05 +0200 Subject: [PATCH 63/63] Update to 2.31.18 --- mingw32-glib2.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index 64de048..b69fe4f 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -3,8 +3,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-glib2 -Version: 2.31.16 -Release: 2%{?dist} +Version: 2.31.18 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0 %changelog +* Tue Feb 28 2012 Kalev Lember - 2.31.18-1 +- Update to 2.31.18 + * Mon Feb 27 2012 Erik van Pienbroek - 2.31.16-2 - Rebuild against the mingw-w64 toolchain diff --git a/sources b/sources index 709f55d..86d1058 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49b8c1fbf84de3fe3ef31e9ca8ccefbb glib-2.31.16.tar.xz +0e41bbd820d5a0574eefad30709726b0 glib-2.31.18.tar.xz