libraries/qt5: Updated for version 5.6.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 6 insertions, 59 deletions

diff --git a/libraries/qt5/patches/platformplugin-install-path-fix.patch b/libraries/qt5/patches/platformplugin-install-path-fix.patch
deleted file mode 100644
index 022166de66..0000000000
--- a/libraries/qt5/patches/platformplugin-install-path-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
---- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-04-09 00:11:38.000000000 +0000
-+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-05-31 01:18:29.157175082 +0000
-@@ -20,7 +20,8 @@
-     }
- }
- 
--DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
-+target.path = $$[QT_INSTALL_PLUGINS]/webkit
-+INSTALLS += target
- 
- SOURCES += \
-     WebPlugin.cpp \
diff --git a/libraries/qt5/patches/qt5.whandle.patch b/libraries/qt5/patches/qt5.whandle.patch
deleted file mode 100644
index 4428974d04..0000000000
--- a/libraries/qt5/patches/qt5.whandle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ulf Hermann <ulf.hermann@theqtcompany.com>
-Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
-Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
-
-WIP: Also do hide/show via WA_OutsideWSRange for native widgets
-
-Task-number: QTBUG-48321
-Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
----
-
-diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
-index a006246..024005d 100644
---- a/qtbase/src/widgets/kernel/qwidget.cpp
-+++ b/qtbase/src/widgets/kernel/qwidget.cpp
-@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
- 
-     bool needsShow = false;
- 
--    if (q->isWindow()) {
-+    if (q->isWindow() || q->windowHandle()) {
-         if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
-             q->setAttribute(Qt::WA_OutsideWSRange, true);
-             if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index e0d820ba7d..493de8d248 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,8 +46,8 @@
 # tailored to Qt 5. Modified by Larry Hajali.
 
 PRGNAM=qt5
-VERSION=${VERSION:-5.5.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-5.6.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -101,13 +101,6 @@ find -L . \
 # Slackware patch to build against MySQL/MariaDB.
 patch -p1 < $CWD/patches/qt5.mysql.h.diff
 
-# Install path fix for libplatformplugin.so.
-# https://bugs.webkit.org/show_bug.cgi?id=117077
-patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch
-
-# Prevent cropped video in full-screen mode (QTBUG-48321).
-patch -p1 < $CWD/patches/qt5.whandle.patch
-
 # Patch for the newer mozilla-nss
 patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch
 
@@ -227,16 +220,7 @@ Description: Qt5 Configuration
 Version: $VERSION
 EOF
 
-# Fix internal linking for Qt5WebKit.pc and Qt5WebEngineCore.pc.
-sed -i \
-  -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
+# Fix internal linking for Qt5WebEngineCore.pc.
 
 sed -i 's|-Wl,--whole-archive.*-Wl,--no-whole-archive||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
 
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 478a81d58e..f85f0e46fb 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.5.1"
+VERSION="5.6.1"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.5/5.5.1/single/qt-everywhere-opensource-src-5.5.1.tar.xz"
-MD5SUM="c2a249e8795d45200d997d96860d0353"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.6/5.6.1/single/qt-everywhere-opensource-src-5.6.1.tar.xz"
+MD5SUM="d647574345c45b5ab8b41b2d46efffb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""