From d5adc587346ee8c2ed60bbb79ca49e12ade4b7a1 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Oct 28 2011 00:29:53 +0000 Subject: * Fri Oct 28 2011 Kevin Kofler 4.8.0-0.22.rc1 - fix FTBFS in QtWebKit's wtf library with GLib 2.31 --- diff --git a/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch b/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch new file mode 100644 index 0000000..e24cb5c --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch @@ -0,0 +1,12 @@ +diff -ur qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-04 05:44:31.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-28 02:12:16.000000000 +0200 +@@ -52,7 +52,7 @@ + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; diff --git a/qt.spec b/qt.spec index 9b5135d..1d5180f 100644 --- a/qt.spec +++ b/qt.spec @@ -11,7 +11,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.0 -Release: 0.21.rc1%{?dist} +Release: 0.22.rc1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -89,6 +89,10 @@ Patch71: qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch # https://bugzilla.redhat.com/show_bug.cgi?id=749213 Patch72: qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch +# QtWebKit wtf library: GMutex is a union rather than a struct in GLib >= 2.31 +# fixes FTBFS: https://bugs.webkit.org/show_bug.cgi?id=69840 +Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch + # upstream patches # security patches @@ -409,6 +413,11 @@ popd %patch70 -p1 -b .QTBUG-14724 %patch71 -p1 -b .QTBUG-21900 %patch72 -p1 -b .QUrl_toLocalFile +%if 0%{?fedora} > 16 +# This quick fix works ONLY with GLib >= 2.31. It's harder to fix this portably. +# See https://bugs.webkit.org/show_bug.cgi?id=69840 for the gory details. +%patch73 -p1 -b .qtwebkit-glib231 +%endif # upstream patches @@ -1041,6 +1050,9 @@ fi %changelog +* Fri Oct 28 2011 Kevin Kofler 4.8.0-0.22.rc1 +- fix FTBFS in QtWebKit's wtf library with GLib 2.31 + * Thu Oct 27 2011 Kevin Kofler 4.8.0-0.21.rc1 - fix missing NULL check in the toLocalFile patch (fixes Digikam segfault)