summaryrefslogtreecommitdiffstats
path: root/qt5/build
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-09-22 10:28:28 +0000
committer Eric Hameleers <alien@slackware.com>2018-09-22 10:28:28 +0000
commit87a681dd59034335c52d0ad29d48e7407204c2d9 (patch)
tree99422ed2acd826452cbf87e593e7db0157ec7bd5 /qt5/build
parentad105bd1377ae082c30ef3b512efa68f80b96d36 (diff)
downloadasb-87a681dd59034335c52d0ad29d48e7407204c2d9.tar.gz
asb-87a681dd59034335c52d0ad29d48e7407204c2d9.tar.xz
qt5: updated to 5.11.2
Diffstat (limited to 'qt5/build')
-rwxr-xr-xqt5/build/qt5.SlackBuild12
1 files changed, 10 insertions, 2 deletions
diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild
index 33486952..2f581a4d 100755
--- a/qt5/build/qt5.SlackBuild
+++ b/qt5/build/qt5.SlackBuild
@@ -57,9 +57,13 @@
# Modifications for qt 5.9.5 2018 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.9.6 2018 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.11.0 2018 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.11.1 2018 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.11.2 2018 by Eric Hameleers, Eindhoven, NL
+
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5
-VERSION=${VERSION:-5.11.1}
+VERSION=${VERSION:-5.11.2}
BUILD=${BUILD:-1}
PKGSRC=$(echo $VERSION |cut -d- -f1)
PKGVER=$(echo $VERSION |tr - _)
@@ -120,7 +124,6 @@ case "$ARCH" in
*) TARGET=$ARCH-slackware-linux ;;
esac
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
@@ -155,6 +158,11 @@ cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
# cat $CWD/patches/qt5.private-includes.patch | patch -p1 --verbose || exit 1
#cd - 1>/dev/null
+# Fix compilation error in chromium caused by gcc8:
+cd qtwebengine
+ cat $CWD/patches/qt5.webengine_gcc8.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