Control: tags -1 + patch

uploaded the attached fix to delayed/5.
diff -Nru qtwebkit-2.2.1/debian/changelog qtwebkit-2.2.1/debian/changelog
--- qtwebkit-2.2.1/debian/changelog     2013-11-05 02:15:31.000000000 +0100
+++ qtwebkit-2.2.1/debian/changelog     2014-08-09 13:24:46.000000000 +0200
@@ -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 <d...@debian.org>  Sat, 09 Aug 2014 13:23:55 +0200
+
 qtwebkit (2.2.1-7) unstable; urgency=low
 
   [ Nobuhiro Iwamatsu ]
diff -Nru qtwebkit-2.2.1/debian/patches/ignore-new_gcc_warnings.diff 
qtwebkit-2.2.1/debian/patches/ignore-new_gcc_warnings.diff
--- qtwebkit-2.2.1/debian/patches/ignore-new_gcc_warnings.diff  1970-01-01 
01:00:00.000000000 +0100
+++ qtwebkit-2.2.1/debian/patches/ignore-new_gcc_warnings.diff  2014-08-09 
13:26:30.000000000 +0200
@@ -0,0 +1,13 @@
+Index: b/Source/WebKit.pri
+===================================================================
+--- 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 
-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 -Nru qtwebkit-2.2.1/debian/patches/series 
qtwebkit-2.2.1/debian/patches/series
--- qtwebkit-2.2.1/debian/patches/series        2013-07-24 05:29:27.000000000 
+0200
+++ qtwebkit-2.2.1/debian/patches/series        2014-08-09 13:23:40.000000000 
+0200
@@ -18,3 +18,4 @@
 hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
+ignore-new_gcc_warnings.diff

Reply via email to