From b34d35ccdc6282b4584693786980c8d6ed6708f8 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 11 Sep 2017 23:04:42 +0200
Subject: Updated deps for KDE 5_17.09

---
 deps/qt5-webkit/qt5-webkit.SlackBuild | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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

diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index 6b18728..4fccefa 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -22,10 +22,10 @@
 
 # Derived from the qt5.SlackBuild
 
-# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0 2016,2017 by Eric  Hameleers, Eindhoven, NL
+# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1 2016,2017 by Eric  Hameleers, Eindhoven, NL
 
 PKGNAM=qt5-webkit
-VERSION=${VERSION:-5.9.0}
+VERSION=${VERSION:-5.9.1}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -88,6 +88,16 @@ echo "Extracting qtwebkit-opensource-src-$VERSION.tar.xz"
 tar xf $CWD/qtwebkit-opensource-src-$VERSION.tar.xz || exit 1
 cd qtwebkit-opensource-src-$VERSION || exit 1
 
+# Prevent crashes when compiled with gcc7:
+cat $CWD/patches/qt5-webkit.gcc7.patch | patch -p1 --verbose || exit 1
+
+## Prevent compile error against icu-59:
+#cat $CWD/patches/qt5-webkit.icu59.patch | patch -p1 --verbose || exit 1
+
+# Avoid literally thousands of unneeded warning messages (thanks BLFS):
+sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
+    -i Tools/qmake/mkspecs/features/unix/default_pre.prf
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -111,7 +121,7 @@ export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PA
   
 mkdir build
 cd build
-  qmake-qt5 ..
+  qmake-qt5 ../WebKit.pro
   make || exit 1
   make install INSTALL_ROOT=$PKG || exit 1
 cd ..
-- 
cgit v1.2.3