qt4: add patch to build host-qt4 with gcc6

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

10 files changed, 87 insertions, 35 deletions

diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.8.7/0001-mkspec-for-ptxdist.patch
index 1819380ae..de80ee2f0 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0001-mkspec-for-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0001-mkspec-for-ptxdist.patch
@@ -10,10 +10,10 @@ Add a mkspec for ptxdist:
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- mkspecs/linux-ptx-g++/qmake.conf.in       |   41 +++++++++++++++++++++++++++++
- mkspecs/linux-ptx-g++/qplatformdefs.h     |    2 ++
- mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   32 ++++++++++++++++++++++
- mkspecs/qws/linux-ptx-g++/qplatformdefs.h |    2 ++
+ mkspecs/linux-ptx-g++/qmake.conf.in       | 41 +++++++++++++++++++++++++++++++
+ mkspecs/linux-ptx-g++/qplatformdefs.h     |  2 ++
+ mkspecs/qws/linux-ptx-g++/qmake.conf.in   | 32 ++++++++++++++++++++++++
+ mkspecs/qws/linux-ptx-g++/qplatformdefs.h |  2 ++
  4 files changed, 77 insertions(+)
  create mode 100644 mkspecs/linux-ptx-g++/qmake.conf.in
  create mode 100644 mkspecs/linux-ptx-g++/qplatformdefs.h
@@ -22,7 +22,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 
 diff --git a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in
 new file mode 100644
-index 0000000..c3e0150
+index 000000000000..c3e015018a7d
 --- /dev/null
 +++ b/mkspecs/linux-ptx-g++/qmake.conf.in
 @@ -0,0 +1,41 @@
@@ -69,7 +69,7 @@ index 0000000..c3e0150
 +load(qt_config)
 diff --git a/mkspecs/linux-ptx-g++/qplatformdefs.h b/mkspecs/linux-ptx-g++/qplatformdefs.h
 new file mode 100644
-index 0000000..05c77d1
+index 000000000000..05c77d16fda6
 --- /dev/null
 +++ b/mkspecs/linux-ptx-g++/qplatformdefs.h
 @@ -0,0 +1,2 @@
@@ -77,7 +77,7 @@ index 0000000..05c77d1
 +#include "../linux-g++/qplatformdefs.h"
 diff --git a/mkspecs/qws/linux-ptx-g++/qmake.conf.in b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
 new file mode 100644
-index 0000000..b52d5e7
+index 000000000000..b52d5e730904
 --- /dev/null
 +++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
 @@ -0,0 +1,32 @@
@@ -115,7 +115,7 @@ index 0000000..b52d5e7
 +load(qt_config)
 diff --git a/mkspecs/qws/linux-ptx-g++/qplatformdefs.h b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h
 new file mode 100644
-index 0000000..e10ebcf
+index 000000000000..e10ebcfcc3d9
 --- /dev/null
 +++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h
 @@ -0,0 +1,2 @@
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.8.7/0002-disable-ordered-compiling.patch
index 69a455950..6a0027530 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0002-disable-ordered-compiling.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0002-disable-ordered-compiling.patch
@@ -8,13 +8,13 @@ qmake generates the correct dependancies.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- examples/examples.pro |    4 ++++
- projects.pro          |    1 -
- src/src.pro           |    8 ++++++--
+ examples/examples.pro | 4 ++++
+ projects.pro          | 1 -
+ src/src.pro           | 8 ++++++--
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/examples/examples.pro b/examples/examples.pro
-index f7d5306..67b4cf8 100644
+index f7d5306f54e2..67b4cf826a7c 100644
 --- a/examples/examples.pro
 +++ b/examples/examples.pro
 @@ -51,6 +51,10 @@ contains(DEFINES, QT_NO_GESTURES): SUBDIRS -= gestures
@@ -29,7 +29,7 @@ index f7d5306..67b4cf8 100644
  
  contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 diff --git a/projects.pro b/projects.pro
-index a2bc4b3..839670d 100644
+index a2bc4b3be1b5..839670d029e9 100644
 --- a/projects.pro
 +++ b/projects.pro
 @@ -2,7 +2,6 @@
@@ -41,7 +41,7 @@ index a2bc4b3..839670d 100644
  
  cross_compile: CONFIG += nostrip
 diff --git a/src/src.pro b/src/src.pro
-index b9e48f4..4b1cf0d 100644
+index b9e48f418d0c..4b1cf0db0e4d 100644
 --- a/src/src.pro
 +++ b/src/src.pro
 @@ -100,12 +100,13 @@ src_declarative.target = sub-declarative
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.8.7/0003-Hack-hide-cursor-during-startup.patch
index e7a745bcd..06772bcf0 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0003-Hack-hide-cursor-during-startup.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0003-Hack-hide-cursor-during-startup.patch
@@ -9,11 +9,11 @@ Otherwise the cursor returns when the mouse is moved.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/gui/embedded/qwscursor_qws.cpp |    2 +-
+ src/gui/embedded/qwscursor_qws.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp
-index 52800c3..25f13f2 100644
+index 6b13076653cd..475ea26d8f8c 100644
 --- a/src/gui/embedded/qwscursor_qws.cpp
 +++ b/src/gui/embedded/qwscursor_qws.cpp
 @@ -344,7 +344,7 @@ void QWSServerPrivate::initializeCursor()
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.8.7/0004-add-missing-subdirs.patch
index 8abbf54a5..cf6024ee8 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0004-add-missing-subdirs.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0004-add-missing-subdirs.patch
@@ -7,14 +7,14 @@ This patch fixes it.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- examples/declarative/modelviews/modelviews.pro |    1 +
- examples/examples.pro                          |    2 +-
- examples/itemviews/itemviews.pro               |    4 +++-
- examples/tutorials/tutorials.pro               |    1 +
+ examples/declarative/modelviews/modelviews.pro | 1 +
+ examples/examples.pro                          | 2 +-
+ examples/itemviews/itemviews.pro               | 4 +++-
+ examples/tutorials/tutorials.pro               | 1 +
  4 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
-index 00e07fe..7f7d673 100644
+index 00e07fec030e..7f7d673346f9 100644
 --- a/examples/declarative/modelviews/modelviews.pro
 +++ b/examples/declarative/modelviews/modelviews.pro
 @@ -1,6 +1,7 @@
@@ -26,7 +26,7 @@ index 00e07fe..7f7d673 100644
      stringlistmodel \
      abstractitemmodel \
 diff --git a/examples/examples.pro b/examples/examples.pro
-index 67b4cf8..e67030a 100644
+index 67b4cf826a7c..e67030a17357 100644
 --- a/examples/examples.pro
 +++ b/examples/examples.pro
 @@ -72,7 +72,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative helper
@@ -39,7 +39,7 @@ index 67b4cf8..e67030a 100644
  # install
  sources.files = README *.pro
 diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
-index 137599c..547694d 100644
+index 137599ca6553..547694d9f50a 100644
 --- a/examples/itemviews/itemviews.pro
 +++ b/examples/itemviews/itemviews.pro
 @@ -2,6 +2,7 @@ TEMPLATE      = subdirs
@@ -61,7 +61,7 @@ index 137599c..547694d 100644
  # install
  sources.files = README *.pro
 diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
-index ba1769d..cb1ca6e 100644
+index ba1769deb459..cb1ca6ea382b 100644
 --- a/examples/tutorials/tutorials.pro
 +++ b/examples/tutorials/tutorials.pro
 @@ -1,5 +1,6 @@
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.8.7/0005-Fix-dnd-issue-on-QWS.patch
index 511ff6918..dbd4c3770 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0005-Fix-dnd-issue-on-QWS.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0005-Fix-dnd-issue-on-QWS.patch
@@ -8,11 +8,11 @@ This patch seems to fix it, but I'm not sure if it breaks anything.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/gui/kernel/qdnd_qws.cpp |    9 +++------
+ src/gui/kernel/qdnd_qws.cpp | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp
-index 72488e8..11b2231 100644
+index a925fdfe1b65..22dd43d31e80 100644
 --- a/src/gui/kernel/qdnd_qws.cpp
 +++ b/src/gui/kernel/qdnd_qws.cpp
 @@ -162,10 +162,10 @@ void QDragManager::updateCursor()
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0006-qmake-make-sure-local-include-dirs-come-first.patch b/patches/qt-everywhere-opensource-src-4.8.7/0006-qmake-make-sure-local-include-dirs-come-first.patch
index b2a290219..398c0ae51 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0006-qmake-make-sure-local-include-dirs-come-first.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0006-qmake-make-sure-local-include-dirs-come-first.patch
@@ -7,12 +7,12 @@ CXXFLAGS is used instead of the one in webkit.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- qmake/generators/unix/unixmake.cpp  |    2 +-
- qmake/generators/unix/unixmake2.cpp |    2 +-
+ qmake/generators/unix/unixmake.cpp  | 2 +-
+ qmake/generators/unix/unixmake2.cpp | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index fdcc68a..74f7974 100644
+index 0f06b814e4d6..5f7556832c4e 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
 @@ -246,7 +246,7 @@ UnixMakefileGenerator::init()
@@ -25,7 +25,7 @@ index fdcc68a..74f7974 100644
          QString compiler = comps[i];
          if (compiler == "C")
 diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index 336906d..cec7362 100644
+index 50af9d23e1d7..aecd61d0ed18 100644
 --- a/qmake/generators/unix/unixmake2.cpp
 +++ b/qmake/generators/unix/unixmake2.cpp
 @@ -999,7 +999,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch b/patches/qt-everywhere-opensource-src-4.8.7/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
index 709806f19..6f834ad2b 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
@@ -6,11 +6,11 @@ patch from http://bugreports.qt.nokia.com/browse/QTBUG-8737
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp |    7 ++-----
+ src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
-index 89d5a9d..8508001 100644
+index 89d5a9db9e63..85080014b1e7 100644
 --- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
 +++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
 @@ -18,6 +18,7 @@
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0008-don-t-build-webkit-tests.patch b/patches/qt-everywhere-opensource-src-4.8.7/0008-don-t-build-webkit-tests.patch
index d9a36f1cd..a45563d73 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/0008-don-t-build-webkit-tests.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0008-don-t-build-webkit-tests.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] don't build webkit tests
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/3rdparty/webkit/Source/WebKit.pro |    4 ----
+ src/3rdparty/webkit/Source/WebKit.pro | 4 ----
  1 file changed, 4 deletions(-)
 
 diff --git a/src/3rdparty/webkit/Source/WebKit.pro b/src/3rdparty/webkit/Source/WebKit.pro
-index 9be0f4a..eee88fe 100644
+index 9be0f4aff9c9..eee88fea1f1e 100644
 --- a/src/3rdparty/webkit/Source/WebKit.pro
 +++ b/src/3rdparty/webkit/Source/WebKit.pro
 @@ -15,19 +15,15 @@ SUBDIRS += WebKit/qt/QtWebKit.pro
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0009-fix-build-issues-with-gcc6.patch b/patches/qt-everywhere-opensource-src-4.8.7/0009-fix-build-issues-with-gcc6.patch
new file mode 100644
index 000000000..1c40eb8b3
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0009-fix-build-issues-with-gcc6.patch
@@ -0,0 +1,51 @@
+From: Than Ngo <than@redhat.com>
+Date: Thu, 20 Oct 2016 11:15:33 +0200
+Subject: [PATCH] fix build issues with gcc6
+
+This patch solves two issues:
+ - Use the correct key for the compiler.
+ - Avoid a shift overflow.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure                            | 4 ++--
+ src/xmlpatterns/api/qcoloroutput_p.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 10ad7ca0b0b7..a8e6dc141eda 100755
+--- a/configure
++++ b/configure
+@@ -7734,7 +7734,7 @@ case "$XPLATFORM" in
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    5*|4*|3.4*)
++	    8*|7*|6*|5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"
+@@ -8050,7 +8050,7 @@ g++*)
+     3.*)
+         COMPILER_VERSION="3.*"
+         ;;
+-    5*|4.*)
++    8*|7*|6*|5*|4.*)
+         COMPILER_VERSION="4"
+         ;;
+     *)
+diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
+index 7911e8962501..be284d14096e 100644
+--- a/src/xmlpatterns/api/qcoloroutput_p.h
++++ b/src/xmlpatterns/api/qcoloroutput_p.h
+@@ -70,8 +70,8 @@ namespace QPatternist
+             ForegroundShift = 10,
+             BackgroundShift = 20,
+             SpecialShift    = 20,
+-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
++            ForegroundMask  = 0x1f << ForegroundShift,
++            BackgroundMask  = 0x7 << BackgroundShift
+         };
+ 
+     public:
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/series b/patches/qt-everywhere-opensource-src-4.8.7/series
index a77b284b8..9c07088cc 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/series
+++ b/patches/qt-everywhere-opensource-src-4.8.7/series
@@ -8,4 +8,5 @@
 0006-qmake-make-sure-local-include-dirs-come-first.patch
 0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
 0008-don-t-build-webkit-tests.patch
-# 8d5103d37d335eb55a93be1930c153b2  - git-ptx-patches magic
+0009-fix-build-issues-with-gcc6.patch
+# 3810087cb4ae9063abad39054889322f  - git-ptx-patches magic