qt5: version bump 5.6.0 -> 5.6.1

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

10 files changed, 5 insertions, 152 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
deleted file mode 100644
index 4b7b0c757..000000000
--- a/patches/qt-everywhere-opensource-src-5.6.0/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch b/patches/qt-everywhere-opensource-src-5.6.0/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
deleted file mode 100644
index 14ef205ff..000000000
--- a/patches/qt-everywhere-opensource-src-5.6.0/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 12 Feb 2016 12:37:15 +0100
-Subject: [PATCH] Search for libsystemd first, fall back to libsystemd-journal
-
-systemd >= 209 merged the individual libraries libsystemd-journal,
-libsystemd-login, libsystemd-id128 and libsystemd-daemon into
-a single library, libsystemd. To ease the transition one could pass
-an option to its build to generate stub libraries and matching
-pkg-config files. With systemd >= 229 this option has now been
-removed, causing the build to fail when the journald option is
-enabled.
-
-Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
----
- qtbase/config.tests/unix/journald/journald.pro | 6 +++++-
- qtbase/src/corelib/global/global.pri           | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/config.tests/unix/journald/journald.pro b/qtbase/config.tests/unix/journald/journald.pro
-index 2bb50ceb71c5..ea765642e6ea 100644
---- a/qtbase/config.tests/unix/journald/journald.pro
-+++ b/qtbase/config.tests/unix/journald/journald.pro
-@@ -1,6 +1,10 @@
- SOURCES = journald.c
- 
- CONFIG += link_pkgconfig
--PKGCONFIG_PRIVATE += libsystemd-journal
-+
-+packagesExist(libsystemd): \
-+    PKGCONFIG_PRIVATE += libsystemd
-+else: \
-+    PKGCONFIG_PRIVATE += libsystemd-journal
- 
- CONFIG -= qt
-diff --git a/qtbase/src/corelib/global/global.pri b/qtbase/src/corelib/global/global.pri
-index aa4945f90e3a..dd846955f61e 100644
---- a/qtbase/src/corelib/global/global.pri
-+++ b/qtbase/src/corelib/global/global.pri
-@@ -53,7 +53,10 @@ slog2 {
- 
- journald {
-     CONFIG += link_pkgconfig
--    PKGCONFIG_PRIVATE += libsystemd-journal
-+    packagesExist(libsystemd): \
-+        PKGCONFIG_PRIVATE += libsystemd
-+    else: \
-+        PKGCONFIG_PRIVATE += libsystemd-journal
-     DEFINES += QT_USE_JOURNALD
- }
- 
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0102-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
deleted file mode 100644
index c9fa5065b..000000000
--- a/patches/qt-everywhere-opensource-src-5.6.0/0102-qtbase-examples-fix-building-without-session-managem.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 29 Feb 2016 16:21:24 +0100
-Subject: [PATCH] qtbase: examples: fix building without session management
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtbase/examples/widgets/mainwindows/application/mainwindow.cpp | 4 ++++
- qtbase/examples/widgets/mainwindows/application/mainwindow.h   | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp b/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
-index 861b908189d8..9b8ae818282a 100644
---- a/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
-+++ b/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
-@@ -59,9 +59,11 @@ MainWindow::MainWindow()
-     connect(textEdit->document(), &QTextDocument::contentsChanged,
-             this, &MainWindow::documentWasModified);
- 
-+#ifndef QT_NO_SESSIONMANAGER
-     QGuiApplication::setFallbackSessionManagementEnabled(false);
-     connect(qApp, &QGuiApplication::commitDataRequest,
-             this, &MainWindow::commitData);
-+#endif
- 
-     setCurrentFile(QString());
-     setUnifiedTitleAndToolBarOnMac(true);
-@@ -388,6 +390,7 @@ QString MainWindow::strippedName(const QString &fullFileName)
- }
- //! [49]
- 
-+#ifndef QT_NO_SESSIONMANAGER
- void MainWindow::commitData(QSessionManager &manager)
- {
-     if (manager.allowsInteraction()) {
-@@ -399,3 +402,4 @@ void MainWindow::commitData(QSessionManager &manager)
-             save();
-     }
- }
-+#endif
-diff --git a/qtbase/examples/widgets/mainwindows/application/mainwindow.h b/qtbase/examples/widgets/mainwindows/application/mainwindow.h
-index 9712604125b5..690e8ebc32ea 100644
---- a/qtbase/examples/widgets/mainwindows/application/mainwindow.h
-+++ b/qtbase/examples/widgets/mainwindows/application/mainwindow.h
-@@ -70,7 +70,9 @@ private slots:
-     bool saveAs();
-     void about();
-     void documentWasModified();
-+#ifndef QT_NO_SESSIONMANAGER
-     void commitData(QSessionManager &);
-+#endif
- 
- private:
-     void createActions();
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch b/patches/qt-everywhere-opensource-src-5.6.1/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
index 957d0b72a..3baf73a39 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+)
 
 diff --git a/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro b/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
-index 0f493fdc01d7..79a2e708e894 100644
+index a628cdccd938..f7e3400615e6 100644
 --- a/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
 +++ b/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
-@@ -7,6 +7,8 @@ load(qt_plugin)
+@@ -2,6 +2,8 @@ TARGET = qeglfs
  
  QT += platformsupport-private eglfs_device_lib-private
  
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch b/patches/qt-everywhere-opensource-src-5.6.1/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
index f51b8411c..d084bffce 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qtwebengine/src/core/gyp_run.pro b/qtwebengine/src/core/gyp_run.pro
-index dea1a2225ae2..b14c7db4a404 100644
+index 5bedc9acbc29..8ad87b352ea3 100644
 --- a/qtwebengine/src/core/gyp_run.pro
 +++ b/qtwebengine/src/core/gyp_run.pro
 @@ -47,7 +47,7 @@ cross_compile {
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-opensource-src-5.6.1/0102-qt3d-link-with-latomic-if-necessary.patch
index 0e62abc48..0e62abc48 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/0102-qt3d-link-with-latomic-if-necessary.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.6.1/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
index db225cdc6..db225cdc6 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.6.1/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
index 2ea4c7587..2ea4c7587 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch b/patches/qt-everywhere-opensource-src-5.6.1/0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
index 743650049..743650049 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.1/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.1/series
index a6a6c513e..3eb48ca86 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/series
+++ b/patches/qt-everywhere-opensource-src-5.6.1/series
@@ -1,15 +1,12 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 #tag:upstream --start-number 1
-0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
-0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.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
-0103-qt3d-link-with-latomic-if-necessary.patch
+0102-qt3d-link-with-latomic-if-necessary.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
-# 08e3e873ae4e579c68fcd1e3500a81f2  - git-ptx-patches magic
+# 077aaa461e5601f42d59cfd64a4b1ffa  - git-ptx-patches magic