commit c0d1bcbe7f7c31bfea2b01ed74f784776253f7d2
Author: Erik van Pienbroek <[email protected]>
Date: Fri Nov 9 16:25:23 2012 +0100
Fix the build (upstream commit 2b17e7)
glib-commit2b17e7.patch | 28 ++++++++++++++++++++++++++++
mingw-glib2.spec | 4 ++++
2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/glib-commit2b17e7.patch b/glib-commit2b17e7.patch
new file mode 100644
index 0000000..7fa1433
--- /dev/null
+++ b/glib-commit2b17e7.patch
@@ -0,0 +1,28 @@
+From 2b17e797a43944e38babcac1ba02296cfd81623d Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <[email protected]>
+Date: Mon, 05 Nov 2012 09:22:38 +0000
+Subject: gio/gthreadedresolver.c: Fix non-UNIX build
+
+Move the GError *error declaration up, as that variable is also used for
+non-Unix builds.
+---
+diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
+index 23f4360..2c2398e 100644
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -204,12 +204,12 @@ do_lookup_records (GTask *task,
+ {
+ LookupRecordsData *lrd = task_data;
+ GList *targets;
++ GError *error = NULL;
+ #if defined(G_OS_UNIX)
+ gint len = 512;
+ gint herr;
+ GByteArray *answer;
+ gint rrtype;
+- GError *error = NULL;
+
+ rrtype = _g_resolver_record_type_to_rrtype (lrd->record_type);
+ answer = g_byte_array_new ();
+--
+cgit v0.9.0.2
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 580ada1..cf349bb 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -47,6 +47,9 @@ Patch1:
0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=684145
Patch2: glib-build-dbus-proxy-testcase-only-on-unix.patch
+#
http://git.gnome.org/browse/glib/commit/?id=2b17e797a43944e38babcac1ba02296cfd81623d
+Patch3: glib-commit2b17e7.patch
+
%description
MinGW Windows Glib2 library.
@@ -90,6 +93,7 @@ Static version of the MinGW Windows GLib2 library.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
autoreconf -i --force
_______________________________________________
mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/mingw
