Fix the build (upstream commit 2b17e7)
This commit is contained in:
parent
c3acf6294a
commit
c0d1bcbe7f
28
glib-commit2b17e7.patch
Normal file
28
glib-commit2b17e7.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 2b17e797a43944e38babcac1ba02296cfd81623d Mon Sep 17 00:00:00 2001
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
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
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user