diff options
| author | Maximiliano Curia <maxy@debian.org> | 2013-06-27 13:16:29 +0200 |
|---|---|---|
| committer | Maximiliano Curia <maxy@debian.org> | 2013-06-27 13:17:58 +0200 |
| commit | 833dc8f9aeef45fc456bb96b2149ead764b22213 (patch) | |
| tree | 730b252fcd2618c2426b5da381a081cf3c190ef3 /debian | |
| parent | c30284a466599c0af717f293582bc9d9677e885a (diff) | |
| download | qtwebkit-833dc8f9aeef45fc456bb96b2149ead764b22213.tar.gz | |
New patch: ignore-unused-local-typedefs_error.diff.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/ignore-unused-local-typedefs_error.diff | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a1e3494..44ed1d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ qtwebkit (2.2.1-6) UNRELEASED; urgency=low * Avoid auto_clean error when building with --git-overlay. + * New patch: ignore-unused-local-typedefs_error.diff. -- Maximiliano Curia <maxy@debian.org> Thu, 20 Jun 2013 16:17:23 +0200 diff --git a/debian/patches/ignore-unused-local-typedefs_error.diff b/debian/patches/ignore-unused-local-typedefs_error.diff new file mode 100644 index 0000000..97447f8 --- /dev/null +++ b/debian/patches/ignore-unused-local-typedefs_error.diff @@ -0,0 +1,13 @@ +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 + + 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 bc59db0..a943cdb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ defines_qt_webkit.diff glibc_hurd_mkspecs.diff hurd.diff webkit_qt_hide_symbols.diff +ignore-unused-local-typedefs_error.diff |