[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=2e23ee7

The following commit has been merged in the experimental branch:
commit 2e23ee7f92abb9e6b2747e34ed8ce74dcdeee9b1
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 23:47:17 2014 +0200

    Refresh patch: ignore-unused-local-typedefs_error.diff
---
 .../ignore-unused-local-typedefs_error.diff        | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/patches/ignore-unused-local-typedefs_error.diff b/debian/patches/ignore-unused-local-typedefs_error.diff
index 97447f8..e1aa278 100644
--- a/debian/patches/ignore-unused-local-typedefs_error.diff
+++ b/debian/patches/ignore-unused-local-typedefs_error.diff
@@ -1,13 +1,11 @@
-Index: qtwebkit-2.2.1/Source/WebKit.pri
-===================================================================
---- qtwebkit-2.2.1.orig/Source/WebKit.pri	2013-06-27 11:20:32.399249093 +0200
-+++ qtwebkit-2.2.1/Source/WebKit.pri	2013-06-27 11:23:00.173320833 +0200
-@@ -114,7 +114,7 @@
- 
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++*|glibc-*|hurd-* {
--    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
-+    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs
- 
+--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
++++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -19,7 +19,7 @@
+ linux-*g++*|glibc-*|hurd-* {
+     !production_build {
+         # Treat warnings as errors on x86/Linux/GCC
+-        isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
++        isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs
+     }
      greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
-         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+         !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\+\+(0x|11)) {

-- 
QtWebKit packaging