From f91bc1269b04a65a5bce6ae4062aea1da38f8dcd Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 1 Jan 2013 23:08:41 +0100 Subject: [PATCH] Update to 2.35.3 --- glib-commit2b17e7.patch | 28 ---------------------------- mingw-glib2.spec | 9 ++++----- sources | 2 +- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 glib-commit2b17e7.patch diff --git a/glib-commit2b17e7.patch b/glib-commit2b17e7.patch deleted file mode 100644 index 7fa1433..0000000 --- a/glib-commit2b17e7.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2b17e797a43944e38babcac1ba02296cfd81623d Mon Sep 17 00:00:00 2001 -From: Chun-wei Fan -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 cf349bb..3d5366b 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -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 - 2.35.3-1 +- Update to 2.35.3 + * Fri Nov 9 2012 Erik van Pienbroek - 2.35.1-1 - Update to 2.35.1 diff --git a/sources b/sources index 9218fdb..5e80bd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6375a4441c2723fb155c8315f0eab26f glib-2.35.1.tar.xz +ffc3a6a6ce6c60d6535abacb74181328 glib-2.35.3.tar.xz