Bug#667911: Qt based project ftbfs with GCC-4.7

[Matthias Klose <doko@debian.org>]

On 16.04.2012 21:11, Matthias Klose wrote:
> Hi, I'm planning to upload this package to delayed/5 unstable; it causes build
> failures in other packages for the GCC 4.7 test rebuild. The NMU allows us to go
> forward with fixing issues in these packages unrelated to the qt4 header issue.

complete patch



diff -Nru qt4-x11-4.7.4/debian/changelog qt4-x11-4.7.4/debian/changelog
--- qt4-x11-4.7.4/debian/changelog	2012-03-24 23:32:37.000000000 +0100
+++ qt4-x11-4.7.4/debian/changelog	2012-04-16 21:04:44.000000000 +0200
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.7.4-3.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #667911.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Apr 2012 21:03:54 +0200
+
 qt4-x11 (4:4.7.4-3) unstable; urgency=low
 
   * Team upload.
diff -Nru qt4-x11-4.7.4/debian/patches/fix-ftbfs-gcc4.7.diff qt4-x11-4.7.4/debian/patches/fix-ftbfs-gcc4.7.diff
--- qt4-x11-4.7.4/debian/patches/fix-ftbfs-gcc4.7.diff	1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.7.4/debian/patches/fix-ftbfs-gcc4.7.diff	2012-04-16 21:20:33.000000000 +0200
@@ -0,0 +1,41 @@
+Index: qt4-x11-4.7.4/src/corelib/kernel/qobjectdefs.h
+===================================================================
+--- qt4-x11-4.7.4.orig/src/corelib/kernel/qobjectdefs.h	2011-08-23 12:02:27.000000000 +0000
++++ qt4-x11-4.7.4/src/corelib/kernel/qobjectdefs.h	2012-04-16 19:02:28.640930327 +0000
+@@ -216,7 +216,7 @@
+ #define QTOSTRING_HELPER(s) #s
+ #define QTOSTRING(s) QTOSTRING_HELPER(s)
+ #ifndef QT_NO_DEBUG
+-# define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__)
++# define QLOCATION "\0" __FILE__ ":" QTOSTRING(__LINE__)
+ # define METHOD(a)   qFlagLocation("0"#a QLOCATION)
+ # define SLOT(a)     qFlagLocation("1"#a QLOCATION)
+ # define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)
+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
+--- ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me	2012-01-24 11:40:07.167856677 +0100
++++ ./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)
+             {
+
diff -Nru qt4-x11-4.7.4/debian/patches/series qt4-x11-4.7.4/debian/patches/series
--- qt4-x11-4.7.4/debian/patches/series	2012-03-24 23:03:29.000000000 +0100
+++ qt4-x11-4.7.4/debian/patches/series	2012-04-16 21:03:52.000000000 +0200
@@ -55,3 +55,4 @@
 Remove_QtHelp_dependency_on_QtXml.patch
 CVE-2011-3922.patch
 fix-format.diff
+fix-ftbfs-gcc4.7.diff