[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-1-g45794d6

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 45794d6feb4a9a49754c615a628bed256efb275d
Author: Matthias Klose <doko at debian.org>
Date:   Sat Aug 9 13:23:55 2014 +0200

    Ignore warnings introduced by GCC 4.9.
    Closes: #746907.
---
 debian/changelog                                             |  7 +++++++
 ...ocal-typedefs_error.diff => ignore-new_gcc_warnings.diff} | 12 ++++++------
 debian/patches/series                                        |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0b48ff..166c516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtwebkit (2.2.1-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ignore warnings introduced by GCC 4.9. Closes: #746907.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 09 Aug 2014 13:23:55 +0200
+
 qtwebkit (2.2.1-7) unstable; urgency=low
 
   [ Nobuhiro Iwamatsu ]
diff --git a/debian/patches/ignore-unused-local-typedefs_error.diff b/debian/patches/ignore-new_gcc_warnings.diff
similarity index 68%
copy from debian/patches/ignore-unused-local-typedefs_error.diff
copy to debian/patches/ignore-new_gcc_warnings.diff
index 97447f8..255730b 100644
--- a/debian/patches/ignore-unused-local-typedefs_error.diff
+++ b/debian/patches/ignore-new_gcc_warnings.diff
@@ -1,13 +1,13 @@
-Index: qtwebkit-2.2.1/Source/WebKit.pri
+Index: b/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 @@
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -114,7 +114,7 @@ CONFIG -= warn_on
  
  # 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
+-    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs
++    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs -Wno-error=unused-function
  
      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)) {
diff --git a/debian/patches/series b/debian/patches/series
index 683ab26..0e6b662 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ glibc_hurd_mkspecs.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
+ignore-new_gcc_warnings.diff

-- 
QtWebKit packaging