Update to 2.35.3

This commit is contained in:
Erik van Pienbroek 2013-01-01 23:08:41 +01:00
parent c0d1bcbe7f
commit f91bc1269b
3 changed files with 5 additions and 34 deletions

View File

@ -1,28 +0,0 @@
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

View File

@ -1,7 +1,7 @@
%?mingw_package_header
Name: mingw-glib2
Version: 2.35.1
Version: 2.35.3
Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
@ -47,9 +47,6 @@ 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.
@ -93,7 +90,6 @@ Static version of the MinGW Windows GLib2 library.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
autoreconf -i --force
@ -274,6 +270,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
* Tue Jan 1 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.35.3-1
- Update to 2.35.3
* Fri Nov 9 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.35.1-1
- Update to 2.35.1

View File

@ -1 +1 @@
6375a4441c2723fb155c8315f0eab26f glib-2.35.1.tar.xz
ffc3a6a6ce6c60d6535abacb74181328 glib-2.35.3.tar.xz