Update to 2.31.2

2011-11-23 00:57:16 +01:00 · 2011-11-23 00:57:16 +01:00 · 4f17a51fe1
commit 4f17a51fe1
parent ff8b72f559
3 changed files with 25 additions and 2 deletions
--- a/glib-2.31.2-fix-win32-compilation.patch
+++ 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 <glib.h>
+ #include <sys/types.h>
+-#include <sys/wait.h>
+ #include <signal.h>
+ 
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+ static gboolean cb (gpointer data)
+ {
+   return FALSE;
--- 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 <epienbro@fedoraproject.org> - 2.31.2-1
+- Update to 2.31.2
+
 * Tue Oct 18 2011 Kalev Lember <kalevlember@gmail.com> - 2.30.1-1
 - Update to 2.30.1

--- a/2
+++ b/2
@ -1 +1 @@
-1954dca69994fb8f60280341da3fe2ae  glib-2.30.1.tar.xz
+1cbdf314d7c87916a0c3dce83ac0285f  glib-2.31.2.tar.xz