summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-06-30 17:43:36 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-07-01 08:19:48 +0200
commit3330d387c60cf3d02351b207e5504278d41be267 (patch)
tree930406874cd6bb15d6c7788d268b54c1a948b591
parent981c7ca69cc8ac105cab551fd710435f1a262a5f (diff)
downloadptxdist-3330d387c60cf3d02351b207e5504278d41be267.tar.gz
qt5: fix building with newer toolchains
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/qt-everywhere-opensource-src-5.6.1-1/0103-qtwebengine-add-missing-include.patch26
-rw-r--r--patches/qt-everywhere-opensource-src-5.6.1-1/series3
2 files changed, 28 insertions, 1 deletions
diff --git a/patches/qt-everywhere-opensource-src-5.6.1-1/0103-qtwebengine-add-missing-include.patch b/patches/qt-everywhere-opensource-src-5.6.1-1/0103-qtwebengine-add-missing-include.patch
new file mode 100644
index 0000000..f47823f
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.1-1/0103-qtwebengine-add-missing-include.patch
@@ -0,0 +1,26 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 30 Jun 2016 17:24:47 +0200
+Subject: [PATCH] qtwebengine: add missing include
+
+Without this building fails new newer glibc with:
+
+.../touch_evdev_debug_buffer.h:37:15: error: field 'device_name_' has
+incomplete type 'std::__cxx11::string {aka std::__cxx11::basic_string<char>}'
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ .../3rdparty/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/qtwebengine/src/3rdparty/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
+index 673a45467ade..c3187f6572eb 100644
+--- a/qtwebengine/src/3rdparty/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
++++ b/qtwebengine/src/3rdparty/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
+@@ -7,6 +7,7 @@
+
+ #include <linux/input.h>
+ #include <vector>
++#include <string>
+
+ #include "base/memory/scoped_ptr.h"
+ #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
diff --git a/patches/qt-everywhere-opensource-src-5.6.1-1/series b/patches/qt-everywhere-opensource-src-5.6.1-1/series
index 3eb48ca..c7753f6 100644
--- a/patches/qt-everywhere-opensource-src-5.6.1-1/series
+++ b/patches/qt-everywhere-opensource-src-5.6.1-1/series
@@ -5,8 +5,9 @@
0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
0102-qt3d-link-with-latomic-if-necessary.patch
+0103-qtwebengine-add-missing-include.patch
#tag:hacks --start-number 200
0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
-# 077aaa461e5601f42d59cfd64a4b1ffa - git-ptx-patches magic
+# 3d5a08ff9892b2dfc95142380a592b1f - git-ptx-patches magic