[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-3-2-g91d7048

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=91d7048

The following commit has been merged in the master branch:
commit 91d70486a5e3cd0c403235febc206504d19adc5c
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 17 12:09:46 2012 +0200

    fix build failures with GCC 4.7 (#667911)
---
 debian/changelog            |    2 +
 debian/patches/gcc-4.7.diff |   69 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |    1 +
 3 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d9078f..3c11c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt4-x11 (4:4.7.4-4) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix build failures with GCC 4.7; patch gcc-4.7.diff. (Closes: #667911)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Apr 2012 01:55:05 +0200
 
diff --git a/debian/patches/gcc-4.7.diff b/debian/patches/gcc-4.7.diff
new file mode 100644
index 0000000..c77c034
--- /dev/null
+++ b/debian/patches/gcc-4.7.diff
@@ -0,0 +1,69 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix build failures with GCC 4.7
+ Fix build issues with GCC 4.7, like code wrongly mistaken for operator"".
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-04-17
+
+--- a/src/testlib/qxmltestlogger.cpp
++++ b/src/testlib/qxmltestlogger.cpp
+@@ -119,7 +119,7 @@
+     QTest::qt_asprintf(&buf,
+             "<Environment>
"
+             "    <QtVersion>%s</QtVersion>
"
+-            "    <QTestVersion>"QTEST_VERSION_STR"</QTestVersion>
"
++            "    <QTestVersion>" QTEST_VERSION_STR "</QTestVersion>
"
+             "</Environment>
", qVersion());
+     outputString(buf.constData());
+ }
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+@@ -57,9 +57,7 @@
+     
+     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
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+@@ -32,8 +32,7 @@
+     
+     class JSStaticScopeObject : public JSVariableObject {
+     protected:
+-        using JSVariableObject::JSVariableObjectData;
+-        struct JSStaticScopeObjectData : public JSVariableObjectData {
++        struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
+             JSStaticScopeObjectData()
+                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
+             {
+--- a/src/corelib/kernel/qobjectdefs.h
++++ b/src/corelib/kernel/qobjectdefs.h
+@@ -216,7 +216,7 @@
+ #define QTOSTRING_HELPER(s) #s
+ #define QTOSTRING(s) QTOSTRING_HELPER(s)
+ #ifndef QT_NO_DEBUG
+-# define QLOCATION "

-- 
Qt 4 packaging