summaryrefslogtreecommitdiffstats
path: root/deps/qt5
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-11-11 21:34:33 +0100
committer Eric Hameleers <alien@slackware.com>2019-11-11 21:34:33 +0100
commitbc0465f57b9318adebe350dfe36d4b0d27045fc4 (patch)
tree2e62ec1953fd768e08f268e2d9d1bb50abff6845 /deps/qt5
parent25e06aadbdec1fa4113960acb355a4183cb0c552 (diff)
downloadktown-bc0465f57b9318adebe350dfe36d4b0d27045fc4.tar.gz
ktown-bc0465f57b9318adebe350dfe36d4b0d27045fc4.tar.xz
Deps: updates for qt5 and PyQt5
Diffstat (limited to 'deps/qt5')
-rw-r--r--deps/qt5/.url2
-rwxr-xr-xdeps/qt5/qt5.SlackBuild21
2 files changed, 4 insertions, 19 deletions
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