summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/dyson-Wno-c++0x-compat.patch14
-rw-r--r--debian/patches/series1
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 535d8d1..3e49a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebkit (2.2.1-7+dyson1) UNRELEASED; urgency=low
* Added dyson-MathExtras.h.patch
* Added dyson-MachineStackMarker-stackPointer.patch
* Added dyson-glib.patch
+ * Added dyson-Wno-c++0x-compat.patch
-- Igor Pashev <pashev.igor@gmail.com> Tue, 03 Dec 2013 23:54:22 +0400
diff --git a/debian/patches/dyson-Wno-c++0x-compat.patch b/debian/patches/dyson-Wno-c++0x-compat.patch
new file mode 100644
index 0000000..92ad944
--- /dev/null
+++ b/debian/patches/dyson-Wno-c++0x-compat.patch
@@ -0,0 +1,14 @@
+Index: qtwebkit/Source/WebKit.pri
+===================================================================
+--- qtwebkit.orig/Source/WebKit.pri 2013-12-10 19:58:34.964073035 +0400
++++ qtwebkit/Source/WebKit.pri 2013-12-12 14:47:56.394704704 +0400
+@@ -115,7 +115,9 @@
+ # 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
++}
+
++*-g++* {
+ 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)) {
+ # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
diff --git a/debian/patches/series b/debian/patches/series
index 7f87232..d15eca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ dyson-yield.patch
dyson-MathExtras.h.patch
dyson-MachineStackMarker-stackPointer.patch
dyson-glib.patch
+dyson-Wno-c++0x-compat.patch