From bc0465f57b9318adebe350dfe36d4b0d27045fc4 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 11 Nov 2019 21:34:33 +0100
Subject: Deps: updates for qt5 and PyQt5

---
 deps/PyQt5/.url             |  2 +-
 deps/PyQt5/PyQt5.SlackBuild |  8 ++++----
 deps/qt5/.url               |  2 +-
 deps/qt5/qt5.SlackBuild     | 21 +++------------------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url
index 0c86e33..eac8894 100644
--- a/deps/PyQt5/.url
+++ b/deps/PyQt5/.url
@@ -1,2 +1,2 @@
-https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.13.0/PyQt5_gpl-5.13.0.tar.gz
+https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.13.2/PyQt5-5.13.2.tar.gz
 
diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild
index 1010b94..33c203e 100755
--- a/deps/PyQt5/PyQt5.SlackBuild
+++ b/deps/PyQt5/PyQt5.SlackBuild
@@ -29,7 +29,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=PyQt5
-VERSION=${VERSION:-5.13.0}
+VERSION=${VERSION:-5.13.2}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -76,9 +76,9 @@ PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PKGNAM}_gpl-$VERSION
-tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z* || exit 1
-cd ${PKGNAM}_gpl-$VERSION || exit 1
+rm -rf ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
 
 # Remove code that is unneeded if Qt is not bundled and crashes on python2
 # https://www.riverbankcomputing.com/pipermail/pyqt/2019-July/041896.html
diff --git a/deps/qt5/.url b/deps/qt5/.url
index 63b180a..cc9f30b 100644
--- a/deps/qt5/.url
+++ b/deps/qt5/.url
@@ -1 +1 @@
-https://download.qt.io/official_releases/qt/5.13/5.13.1/single/qt-everywhere-src-5.13.1.tar.xz
+https://download.qt.io/official_releases/qt/5.13/5.13.2/single/qt-everywhere-src-5.13.2.tar.xz
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 88e9bfa..88ce38b 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -64,12 +64,13 @@
 # Modifications for qt 5.12.3 2019 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.13.0 2019 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.13.1 2019 by Eric  Hameleers, Eindhoven, NL
+# Modifications for qt 5.13.2 2019 by Eric  Hameleers, Eindhoven, NL
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
-VERSION=${VERSION:-5.13.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.13.2}
+BUILD=${BUILD:-1}
 PKGSRC=$(echo $VERSION |cut -d- -f1)
 PKGVER=$(echo $VERSION |tr - _)
 
@@ -158,16 +159,6 @@ fi
 # Fix path to mysql header:
 cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
-# Fix keyboard input in webengine:
-cd qtbase
-  cat $CWD/patches/qt5.qtbug-77364.patch | patch -p1 --verbose || exit 1
-cd - 1>/dev/null
-
-# Fix hardcoded lib/ dir on x86_64:
-cd qtbase
-  cat $CWD/patches/qt5.qtbug-76255.patch | patch -p1 --verbose || exit 1
-cd - 1>/dev/null
-
 # CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
 # and for it breaks KWin compilation with:
 # /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
@@ -177,12 +168,6 @@ cd qtbase
     | patch -p1 --verbose || exit 1
 cd - 1>/dev/null
 
-# Make qtwebengine compile against pulseaudio 13,
-cd qtwebengine/src/3rdparty
-  cat $CWD/patches/qt5.qtbug-77037.patch \
-    | patch -p1 --verbose || exit 1
-cd - 1>/dev/null
-
 if ! pkg-config --exists libpulse 2>/dev/null ; then
   # Forcibly disable pulseaudio in qtwebengine:
   cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
-- 
cgit v1.2.3