From c0a7633595a16beb862be07da61f7dc847ef23d3 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 26 Jan 2015 23:38:04 +0100 Subject: [PATCH] Update to 2.43.3 --- glib-include-time-h-for-localtime_r.patch | 10 ++++++++++ mingw-glib2.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 glib-include-time-h-for-localtime_r.patch diff --git a/glib-include-time-h-for-localtime_r.patch b/glib-include-time-h-for-localtime_r.patch new file mode 100644 index 0000000..c23d26a --- /dev/null +++ b/glib-include-time-h-for-localtime_r.patch @@ -0,0 +1,10 @@ +--- glib-2.43.2/glib/gdate.c.orig 2015-01-01 23:50:04.203252143 +0100 ++++ glib-2.43.2/glib/gdate.c 2015-01-01 23:50:28.329647373 +0100 +@@ -41,6 +41,7 @@ + + #ifdef G_OS_WIN32 + #include ++#include + #endif + + #include "gdate.h" diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 0a8fd13..3b70954 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-glib2 -Version: 2.42.1 +Version: 2.43.3 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -53,6 +53,7 @@ Patch3: glib-send-log-messages-to-correct-stdout-and-stderr.patch # https://bugzilla.gnome.org/show_bug.cgi?id=698118 Patch5: glib-prefer-constructors-over-DllMain.patch + %description MinGW Windows Glib2 library. @@ -101,16 +102,16 @@ Static version of the MinGW Windows GLib2 library. %build #GLib can't build static and shared libraries in one go, so we build GLib twice -MINGW_BUILDDIR_SUFFIX=static %mingw_configure --disable-shared --enable-static -MINGW_BUILDDIR_SUFFIX=shared %mingw_configure --disable-static +MINGW_BUILDDIR_SUFFIX=_static %mingw_configure --disable-shared --enable-static +MINGW_BUILDDIR_SUFFIX=_shared %mingw_configure --disable-static -MINGW_BUILDDIR_SUFFIX=static %mingw_make %{?_smp_mflags} V=1 -MINGW_BUILDDIR_SUFFIX=shared %mingw_make %{?_smp_mflags} V=1 +MINGW_BUILDDIR_SUFFIX=_static %mingw_make %{?_smp_mflags} V=1 +MINGW_BUILDDIR_SUFFIX=_shared %mingw_make %{?_smp_mflags} V=1 %install -MINGW_BUILDDIR_SUFFIX=static %mingw_make install DESTDIR=$RPM_BUILD_ROOT/build_static -MINGW_BUILDDIR_SUFFIX=shared %mingw_make install DESTDIR=$RPM_BUILD_ROOT +MINGW_BUILDDIR_SUFFIX=_static %mingw_make install DESTDIR=$RPM_BUILD_ROOT/build_static +MINGW_BUILDDIR_SUFFIX=_shared %mingw_make install DESTDIR=$RPM_BUILD_ROOT # Move the static libraries to the right location mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir} @@ -277,6 +278,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Mon Jan 26 2015 Erik van Pienbroek - 2.43.3-1 +- Update to 2.43.3 + * Sat Nov 15 2014 Kalev Lember - 2.42.1-1 - Update to 2.42.1 diff --git a/sources b/sources index 747e872..2912f27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89c4119e50e767d3532158605ee9121a glib-2.42.1.tar.xz +2727c4dee79c5449f364cd5e27b17099 glib-2.43.3.tar.xz