diff --git a/glib-commit-b972018.patch b/glib-commit-b972018.patch new file mode 100644 index 0000000..5914926 --- /dev/null +++ b/glib-commit-b972018.patch @@ -0,0 +1,24 @@ +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/mingw-glib2.spec b/mingw-glib2.spec index bb75e96..7706e3a 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -2,7 +2,7 @@ Name: mingw-glib2 Version: 2.36.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -54,6 +54,13 @@ Patch4: glib-formatstring.patch # http://lists.fedoraproject.org/pipermail/fedora-mingw/2013-March/006429.html 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. @@ -99,6 +106,7 @@ Static version of the MinGW Windows GLib2 library. %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p1 %build @@ -277,6 +285,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Mon Apr 15 2013 Erik van Pienbroek - 2.36.0-3 +- Revert unintended ABI break on win64 (RHBZ #951588, GNOME BZ #697879) + * Fri Mar 29 2013 Kalev Lember - 2.36.0-2 - Drop two patches that have been fixed upstream