diff --git a/glib-commit-b972018.patch b/glib-commit-b972018.patch deleted file mode 100644 index 5914926..0000000 --- a/glib-commit-b972018.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b972018d6c252c4afb1375e5c4e9910e79af2e70 Mon Sep 17 00:00:00 2001 -From: Marc-André Lureau -Date: Mon, 15 Apr 2013 16:12:50 +0000 -Subject: win32: add back missing _utf8 symbols on x64 builds - -The _utf8 functions have been wrongly removed from GLib on x64. - -https://bugzilla.gnome.org/show_bug.cgi?id=697879 ---- -diff --git a/glib/gutils.c b/glib/gutils.c -index 76f6c34..0de954e 100644 ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -2354,7 +2354,7 @@ g_format_size_for_display (goffset size) - } - } - --#if defined (G_OS_WIN32) && !defined (_WIN64) -+#if defined (G_OS_WIN32) - - /* Binary compatibility versions. Not for newly compiled code. */ - --- -cgit v0.9.1 diff --git a/glib-formatstring.patch b/glib-formatstring.patch index 5823f45..8cafd41 100644 --- a/glib-formatstring.patch +++ b/glib-formatstring.patch @@ -9,14 +9,3 @@ TEST_PRINTF ("%a", "Sat"); TEST_PRINTF ("%A", "Saturday"); ---- gio/gdbusmessage.c.orig 2013-02-22 20:07:15.294752111 +0100 -+++ gio/gdbusmessage.c 2013-02-22 20:07:55.788028585 +0100 -@@ -1384,7 +1384,7 @@ - "Wanted to read %lu bytes but only got %lu", - (gulong)len), - (gulong)len, -- (gulong)mbuf->valid_len - mbuf->pos); -+ (gulong)(mbuf->valid_len - mbuf->pos)); - mbuf->pos = mbuf->valid_len; - return NULL; - } diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 7706e3a..019c18e 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-glib2 -Version: 2.36.0 -Release: 3%{?dist} +Version: 2.36.1 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -51,15 +51,11 @@ Patch4: glib-formatstring.patch # Prefer the use of GCC constructors over DllMain # This prevents having to depend on DllMain in static libraries -# http://lists.fedoraproject.org/pipermail/fedora-mingw/2013-March/006429.html +# http://lists.fedoraproject.org/pipermail/mingw/2013-March/006429.html +# http://lists.fedoraproject.org/pipermail/mingw/2013-March/006469.html +# https://bugzilla.gnome.org/show_bug.cgi?id=698118 Patch5: glib-prefer-constructors-over-DllMain.patch -# Revert unintented ABI break on win64 -# https://bugzilla.redhat.com/show_bug.cgi?id=951588 -# https://bugzilla.gnome.org/show_bug.cgi?id=697879 -# Upstream commit b972018d6c252c4afb1375e5c4e9910e79af2e70 -Patch6: glib-commit-b972018.patch - %description MinGW Windows Glib2 library. @@ -106,7 +102,6 @@ Static version of the MinGW Windows GLib2 library. %patch3 -p0 %patch4 -p0 %patch5 -p0 -%patch6 -p1 %build @@ -285,6 +280,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Tue Apr 16 2013 Erik van Pienbroek - 2.36.1-1 +- Update to 2.36.1 +- Dropped upstreamed patches + * Mon Apr 15 2013 Erik van Pienbroek - 2.36.0-3 - Revert unintended ABI break on win64 (RHBZ #951588, GNOME BZ #697879) diff --git a/sources b/sources index 1253c46..ea6aa07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2047dff287473450593edecb18f79c17 glib-2.36.0.tar.xz +a3bbee44a13facb5a3cab18be5ece14c glib-2.36.1.tar.xz