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/qt5/qt5.SlackBuild | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'deps/qt5/qt5.SlackBuild')

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