qt5: add upstream fix and reorganize patches

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 50 insertions, 7 deletions

diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch b/patches/qt-everywhere-opensource-src-5.6.0/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
new file mode 100644
index 000000000..4b7b0c757
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
@@ -0,0 +1,39 @@
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Thu, 3 Mar 2016 15:17:31 +0100
+Subject: [PATCH] Disable c++ standard compiler flags for the host build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no test for c++ standard support for the host build
+(only for the target compiler/build) which leads to trouble
+in some cross compiling environments (old host compiler, new
+cross compiler):
+
+  g++: error: unrecognized command line option ‘-std=c++1z’
+
+So disable c++ standard compiler flags unconditionally for host builds.
+
+Task-number: QTBUG-51644
+Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+---
+ qtbase/mkspecs/features/default_post.prf | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/qtbase/mkspecs/features/default_post.prf b/qtbase/mkspecs/features/default_post.prf
+index cd8d8859aa91..561c8f4858cc 100644
+--- a/qtbase/mkspecs/features/default_post.prf
++++ b/qtbase/mkspecs/features/default_post.prf
+@@ -95,7 +95,10 @@ breakpad {
+     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
+ }
+ 
+-c++11|c++14|c++1z {
++# Disable special compiler flags for host builds (needs to be changed for 5.7
++# to fall back to c++11 because since 5.7 c++11 is required everywhere,
++# including host builds).
++if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
+     c++1z:       cxxstd = CXX1Z
+     else: c++14: cxxstd = CXX14
+     else:        cxxstd = CXX11
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0003-eglfs-plugin-needs-egl-for-correct-cflags.patch b/patches/qt-everywhere-opensource-src-5.6.0/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
index 957d0b72a..957d0b72a 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0003-eglfs-plugin-needs-egl-for-correct-cflags.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch b/patches/qt-everywhere-opensource-src-5.6.0/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
index f51b8411c..f51b8411c 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0006-qtbase-examples-fix-building-without-session-managem.patch b/patches/qt-everywhere-opensource-src-5.6.0/0102-qtbase-examples-fix-building-without-session-managem.patch
index c9fa5065b..c9fa5065b 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0006-qtbase-examples-fix-building-without-session-managem.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0102-qtbase-examples-fix-building-without-session-managem.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.6.0/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
index db225cdc6..db225cdc6 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0002-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.6.0/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
index 2ea4c7587..2ea4c7587 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0002-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch b/patches/qt-everywhere-opensource-src-5.6.0/0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
index 743650049..743650049 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/series b/patches/qt-everywhere-opensource-src-5.6.0/series
index 7508d5dcb..729190f63 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/series
+++ b/patches/qt-everywhere-opensource-src-5.6.0/series
@@ -1,9 +1,13 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
-0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
-0002-HACK-put-wayland-scanner-outout-in-srcdir.patch
-0003-eglfs-plugin-needs-egl-for-correct-cflags.patch
-0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
-0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
-0006-qtbase-examples-fix-building-without-session-managem.patch
-# e60df989524d3e5a942768e7b6daf9f0  - git-ptx-patches magic
+#tag:upstream --start-number 1
+0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
+#tag:fixes --start-number 100
+0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
+0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
+0102-qtbase-examples-fix-building-without-session-managem.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
+# f5d40d79a61654f5248844f73c0274f0  - git-ptx-patches magic