From bb4433ddbf1c0cee32f491d93afa898a32d86376 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 22 Sep 2018 12:56:48 +0200
Subject: Updated and rebuilt some of the deps

OpenAL: updated
cryfs: rebuilt against the new cryptopp
cryptopp: updated
libxkbcommon: updated
qt5: updated
---
 deps/qt5/qt5.SlackBuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 3348695..2f581a4 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/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
-- 
cgit v1.2.3