[mingw32-qt] Fix compilation against gcc 4.7

[epienbro]

commit 8852574f0c55afa4ad477c4366cad4cd979e5c3f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jan 27 22:34:38 2012 +0100

    Fix compilation against gcc 4.7

 mingw32-qt.spec                                  |    8 +++++-
 qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch |   27 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index f61ff3b..8bf1593 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -8,7 +8,7 @@
 
 Name:           mingw32-qt
 Version:        4.8.0
-Release:        2%{?pre}%{?dist}
+Release:        3%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -26,6 +26,8 @@ Source2:        qplatformdefs.h
 Patch10:        mingw32-qt-4.8.0-no-webkit-tests.patch
 # The debug build tries to link against libdbus-1d which doesn't exist
 Patch15:        qt-dbus-dont-link-to-dbus-1d.patch
+# Fix compilation against gcc 4.7
+Patch16:        qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
 
 BuildArch:      noarch
 
@@ -65,6 +67,7 @@ Fedora Windows cross-compiler.
 
 %patch10 -p1 -b .no_webkit_tests
 %patch15 -p0
+%patch16 -p1
 
 # Cross-compilation qmake target.
 mkdir mkspecs/%{platform}
@@ -319,6 +322,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 
 
 %changelog
+* Fri Jan 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-3
+- Fix compilation against gcc 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch b/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
new file mode 100644
index 0000000..62c436e
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
@@ -0,0 +1,27 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me	2012-01-24 11:24:14.729942043 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h	2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+     
+     class JSGlobalObject : public JSVariableObject {
+     protected:
+-        using JSVariableObject::JSVariableObjectData;
+-
+-        struct JSGlobalObjectData : public JSVariableObjectData {
++        struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
+             // We use an explicit destructor function pointer instead of a
+             // virtual destructor because we want to avoid adding a vtable
+             // pointer to this struct. Adding a vtable pointer would force the
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me	2012-01-24 11:40:07.167856677 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h	2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+     
+     class JSStaticScopeObject : public JSVariableObject {
+     protected:
+-        using JSVariableObject::JSVariableObjectData;
+-        struct JSStaticScopeObjectData : public JSVariableObjectData {
++        struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
+             JSStaticScopeObjectData()
+                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
+             {