From f8c0c8d872fd4d0b8920ecabf107a99044813099 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 24 Oct 2018 14:02:03 +0200
Subject: Updates to the dependencies for upcoming Plasma5 release

The update of icu4c in -current required that several packages had to be
recompiled or upgraded to get them to work again.
Unfortunately the update of icu4c in -current co-incided with my release
of KDE 5_18.10 and these deps had to be fixed post-release.

Some issues emerged as a result of these updates:
- SIP now stores private copies of sip.so in PyQt5 subdirectories,
  and the hp-systray in the hplip package fails to start as a result
- In the new QScintilla packages, I was unable to compile the
  Python2 bindings for PyQt4.
---
 deps/PyQt/PyQt.SlackBuild             | 52 +++++++++++++++++-----------
 deps/PyQt5/.url                       |  2 +-
 deps/PyQt5/PyQt5.SlackBuild           | 51 ++++++++++++----------------
 deps/QScintilla/.url                  |  2 +-
 deps/QScintilla/QScintilla.SlackBuild | 64 +++++++++++++++++++++--------------
 deps/cryptopp/cryptopp.SlackBuild     |  2 +-
 deps/gpgme/.url                       |  2 +-
 deps/gpgme/gpgme.SlackBuild           |  4 +--
 deps/poppler/poppler.SlackBuild       |  2 +-
 deps/qt5-webkit/.url                  |  2 +-
 deps/qt5-webkit/doinst.sh             |  9 -----
 deps/qt5-webkit/qt5-webkit.SlackBuild | 60 ++++++++++----------------------
 deps/qt5/qt5.SlackBuild               |  7 ++--
 deps/sip/.url                         |  2 +-
 deps/sip/sip.SlackBuild               | 45 +++++++++++++-----------
 15 files changed, 149 insertions(+), 157 deletions(-)
 delete mode 100644 deps/qt5-webkit/doinst.sh

diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild
index 22428c6..8c188b1 100755
--- a/deps/PyQt/PyQt.SlackBuild
+++ b/deps/PyQt/PyQt.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for PyQt
 
 # Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,15 +26,11 @@
 # Modified by Robby Workman <rworkman@slackware.com>
 # Modified by Eric Hameleers <alien@slackware.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=PyQt
 VERSION=${VERSION:-4.12.1}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j7}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -59,7 +55,20 @@ else
   SLKCFLAGS="-O2"
 fi
 
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
 PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
 
 rm -rf $PKG
@@ -86,26 +95,31 @@ export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 
-if [ -n "${PYTHON3LIB}" ]; then
-  python3 configure.py --confirm-license --verbose
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
-  make clean
+python3 configure.py --confirm-license --verbose
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
+make clean
 
-  mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3
-  rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/
-fi
+mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3
+rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/
 
-python configure.py --confirm-license --verbose
+python2 configure.py --confirm-license --verbose
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
 
-rm -rf $PKG/$PYTHONLIB/${PKGNAM}4/uic/port_v3/
+rm -rf $PKG/$PYTHON2LIB/${PKGNAM}4/uic/port_v3/
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Remove rpaths:
+for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
+  if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
+    patchelf --remove-rpath $file
+  fi
+done
+
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \
diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url
index dd28dc0..00e3b3e 100644
--- a/deps/PyQt5/.url
+++ b/deps/PyQt5/.url
@@ -1,2 +1,2 @@
-https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.10.1/PyQt5_gpl-5.10.1.tar.gz
+https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.11.3/PyQt5_gpl-5.11.3.tar.gz
 
diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild
index 3ee77fe..29cd009 100755
--- a/deps/PyQt5/PyQt5.SlackBuild
+++ b/deps/PyQt5/PyQt5.SlackBuild
@@ -27,10 +27,10 @@
 # Modified by Eric Hameleers <alien@slackware.com>
 
 PKGNAM=PyQt5
-VERSION=${VERSION:-5.10.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.11.3}
+BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:-"j$(nproc)"}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -71,11 +71,6 @@ rm -rf ${PKGNAM}_gpl-$VERSION
 tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}_gpl-$VERSION || exit 1
 
-# Support new versions of Qt:
-cat $CWD/patches/pyqt-support-new-qt.patch | patch -p1 --verbose || exit 1
-cat $CWD/patches/pyqt5-cura-crash.patch | patch -p1 --verbose || exit 1
-cat $CWD/patches/pyqt-qt5.11.patch | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -90,25 +85,6 @@ export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 
-if [ -n "${PYTHON3LIB}" ]; then
-  python3 configure.py \
-    --confirm-license \
-    --verbose \
-    --qsci-api \
-    -q /usr/bin/qmake-qt5 \
-    || exit 1
-
-  make $NUMJOBS || make || exit 1
-  # INSTALL_ROOT is needed to install libpyqt4.so properly:
-  make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
-  make clean
-
-  mv $PKG/usr/bin/pyrcc5 $PKG/usr/bin/pyrcc5-py3
-  mv $PKG/usr/bin/pyuic5 $PKG/usr/bin/pyuic5-py3
-  mv $PKG/usr/bin/pylupdate5 $PKG/usr/bin/pylupdate5-py3
-  rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/
-fi
-
 python configure.py \
   --confirm-license \
   --verbose \
@@ -117,11 +93,28 @@ python configure.py \
   || exit 1
 
 make $NUMJOBS || make || exit 1
-# INSTALL_ROOT is needed to install libpyqt4.so properly:
-make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
+# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR
+make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
 
+mv $PKG/usr/bin/pyrcc5 $PKG/usr/bin/pyrcc5-py2
+mv $PKG/usr/bin/pyuic5 $PKG/usr/bin/pyuic5-py2
+mv $PKG/usr/bin/pylupdate5 $PKG/usr/bin/pylupdate5-py2
 rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/
 
+python3 configure.py \
+  --confirm-license \
+  --verbose \
+  --qsci-api \
+  -q /usr/bin/qmake-qt5 \
+  || exit 1
+
+make $NUMJOBS || make || exit 1
+# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR
+make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
+make clean
+
+rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/deps/QScintilla/.url b/deps/QScintilla/.url
index 7cf6290..63bbd58 100644
--- a/deps/QScintilla/.url
+++ b/deps/QScintilla/.url
@@ -1 +1 @@
-http://downloads.sourceforge.net/pyqt/QScintilla_gpl-2.10.4.tar.gz
+http://downloads.sourceforge.net/pyqt/QScintilla_gpl-2.10.8.tar.gz
diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild
index cff3954..db7be4e 100755
--- a/deps/QScintilla/QScintilla.SlackBuild
+++ b/deps/QScintilla/QScintilla.SlackBuild
@@ -28,10 +28,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=QScintilla
-VERSION=${VERSION:-2.10.4}
+VERSION=${VERSION:-2.10.8}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -91,18 +91,21 @@ export QMAKEFEATURES=${PWD}/Qt4Qt5/features/
 
 # Conditional build of Qt5 support:
 if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
+  echo "-- Compiling Qt5 support --"
   # QT5 support first:
   cd Qt4Qt5
+    echo "-- >> Qt4Qt5 --"
     qmake-qt5 \
       -o Makefile \
       QMAKE_CFLAGS+="$SLKCFLAGS" \
       QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
       qscintilla.pro || exit 1
     make $NUMJOBS || exit 1
-    make install INSTALL_ROOT=$PKG || exit 1
+    make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
   cd -
 
   cd designer-Qt4Qt5
+    echo "-- >> designer-Qt4Qt5 --"
     qmake-qt5 \
       -o Makefile \
       INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \
@@ -110,27 +113,30 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
       QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
       designer.pro || exit 1
     make $NUMJOBS || exit 1
-    make install INSTALL_ROOT=$PKG || exit 1
+    make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
   cd -
 
   cd Python
+    echo "-- >> Python --"
     python3 configure.py \
+      --verbose \
       --qmake /usr/bin/qmake-qt5 \
       --pyqt=PyQt5 \
       -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
       || exit 1
-    make $NUMJOBS || exit 1
-    make install INSTALL_ROOT=$PKG || exit 1
+    make  || exit 1
+    make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
 
     make clean || exit 1
 
-    python configure.py \
+    python2 configure.py \
+      --verbose \
       --qmake /usr/bin/qmake-qt5 \
       --pyqt=PyQt5 \
       -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
       || exit 1
-    make $NUMJOBS || exit 1
-    make install INSTALL_ROOT=$PKG || exit 1
+    make  || exit 1
+    make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
   cd -
 
   # In order to compile Qt4 support next, clean up first:
@@ -140,7 +146,9 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
 fi
 
 # QT4 support:
+echo "-- Compiling Qt4 support --"
 cd Qt4Qt5
+  echo "-- >> Qt4Qt5 --"
   qmake \
     -o Makefile \
     QMAKE_CFLAGS+="$SLKCFLAGS" \
@@ -151,6 +159,7 @@ cd Qt4Qt5
 cd -
 
 cd designer-Qt4Qt5
+  echo "-- >> designer-Qt4Qt5 --"
   qmake \
     -o Makefile \
     INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \
@@ -161,23 +170,26 @@ cd designer-Qt4Qt5
   make install INSTALL_ROOT=$PKG || exit 1
 cd -
 
-cd Python
-  python3 configure.py \
-      --qmake /usr/bin/qmake \
-      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-      || exit 1
-  make $NUMJOBS || exit 1
-  make install INSTALL_ROOT=$PKG || exit 1
-
-  make clean || exit 1
-
-  python configure.py \
-      --qmake /usr/bin/qmake \
-      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-      || exit 1
-  make $NUMJOBS || exit 1
-  make install INSTALL_ROOT=$PKG || exit 1
-cd -
+#cd Python
+#  echo "-- >> Python --"
+#  python3 configure.py \
+#      --verbose \
+#      --qmake /usr/bin/qmake \
+#      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
+#      || exit 1
+#  make -j1 || exit 1
+#  make -j1 install INSTALL_ROOT=$PKG || exit 1
+#
+#  make clean || exit 1
+#
+#  python2 configure.py \
+#      --verbose \
+#      --qmake /usr/bin/qmake \
+#      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
+#      || exit 1
+#  make -j1 || exit 1
+#  make -j1 install INSTALL_ROOT=$PKG || exit 1
+#cd -
 
 # Link the shared libraries into /usr/lib${LIBDIRSUFFIX}:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
diff --git a/deps/cryptopp/cryptopp.SlackBuild b/deps/cryptopp/cryptopp.SlackBuild
index e3a6079..97a4fd7 100755
--- a/deps/cryptopp/cryptopp.SlackBuild
+++ b/deps/cryptopp/cryptopp.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=cryptopp
 VERSION=${VERSION:-7.0.0}
 SRCVER=$(echo $VERSION | tr -d '.')
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-$(nproc)}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
diff --git a/deps/gpgme/.url b/deps/gpgme/.url
index 3461387..fa15d27 100644
--- a/deps/gpgme/.url
+++ b/deps/gpgme/.url
@@ -1 +1 @@
-https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.11.1.tar.bz2
+https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2
diff --git a/deps/gpgme/gpgme.SlackBuild b/deps/gpgme/gpgme.SlackBuild
index c4014d5..d9fe9f3 100755
--- a/deps/gpgme/gpgme.SlackBuild
+++ b/deps/gpgme/gpgme.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gpgme
-VERSION=${VERSION:-1.11.1}
+VERSION=${VERSION:-1.12.0}
 BUILD=${BUILD:-1}
 
 # Find out the default python version:
@@ -36,7 +36,7 @@ else
   MYPY="python2"
 fi
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild
index 6a1142c..d3a96c1 100755
--- a/deps/poppler/poppler.SlackBuild
+++ b/deps/poppler/poppler.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=poppler
 VERSION=${VERSION:-0.68.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url
index 0924d34..43978c6 100644
--- a/deps/qt5-webkit/.url
+++ b/deps/qt5-webkit/.url
@@ -1 +1 @@
-http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
+https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha2/qtwebkit-5.212.0-alpha2.tar.xz
diff --git a/deps/qt5-webkit/doinst.sh b/deps/qt5-webkit/doinst.sh
deleted file mode 100644
index 3e5691a..0000000
--- a/deps/qt5-webkit/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index 721b79d..9650189 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -22,13 +22,14 @@
 
 # Derived from the qt5.SlackBuild
 
-# 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
+# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1, 5.212 2016, 2017, 2018 by Eric  Hameleers, Eindhoven, NL
 
 PKGNAM=qt5-webkit
-VERSION=${VERSION:-5.9.1}
-BUILD=${BUILD:-3}
+SRCVER=${SRCVER:-"5.212.0-alpha2"}
+VERSION=$(echo $SRCVER | tr - _)
+BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -58,13 +59,6 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKLDFLAGS=""
   SLKLDFLAGS="-L/usr/lib64"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
-  # More permanent solution is to patch gcc:
-  # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   SLKLDFLAGS=""
@@ -83,21 +77,14 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf qtwebkit-opensource-src-$VERSION
-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
+rm -rf qtwebkit-$SRCVER
+echo "Extracting qtwebkit-$SRCVER.tar.xz"
+tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1
+cd qtwebkit-$SRCVER || 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 \) \
@@ -114,41 +101,29 @@ else
 fi
 
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS -fpermissive"
+export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive"
 export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
 export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
   
 mkdir build
 cd build
-  qmake-qt5 ../WebKit.pro
-  make || exit 1
-  make install INSTALL_ROOT=$PKG || exit 1
+  cmake .. \
+    -DPORT=Qt \
+    -DQt5_DIR=$QTDIR \
+    -DCMAKE_BUILD_TYPE=Release
+  make ${NUMJOBS} || make || exit 1
+  make install DESTDIR=$PKG || exit 1
 cd ..
 
 # Strip binaries the Slackware way:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# Fix internal linking for Qt5WebKit.pc , thanks to Larry Hajali's SBo script:
-sed -i \
-  -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
-
 # Fix the path in prl files:
 find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 
-## Fix the qmake path in pri file:
-#sed -i "s,${QTDIR}/qtbase,/usr/lib${LIBDIRSUFFIX}/qt5," \
-#  $PKG/usr/lib${LIBDIRSUFFIX}/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
-
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
@@ -162,7 +137,6 @@ fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 2f581a4..0eee250 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -64,7 +64,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
 VERSION=${VERSION:-5.11.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 PKGSRC=$(echo $VERSION |cut -d- -f1)
 PKGVER=$(echo $VERSION |tr - _)
 
@@ -178,7 +178,7 @@ sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
 sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
   -i qtbase/mkspecs/common/g++-unix.conf || exit 1
 
-# Enable h.264 codec support:
+# Enable h.264 codec support (no longer works with Qt 5.11)):
 echo "WEBENGINE_CONFIG += use_proprietary_codecs" >> qtwebengine/.qmake.conf
 
 # Enable all languages in the virtual keyboard (required by Plasma 5.11):
@@ -202,6 +202,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \
   -docdir /usr/doc/qt5-$PKGVER \
   -examplesdir /usr/doc/qt5-$PKGVER/examples \
+  -proprietary-codecs \
   -system-libpng \
   -system-libjpeg \
   -system-sqlite \
@@ -214,7 +215,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -glib \
   -icu \
   -opengl \
-  -openssl \
+  -openssl-linked \
   -optimized-qmake \
   -qpa xcb \
   -qt-harfbuzz \
diff --git a/deps/sip/.url b/deps/sip/.url
index 1e93d0f..ea8cde5 100644
--- a/deps/sip/.url
+++ b/deps/sip/.url
@@ -1,2 +1,2 @@
-https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.6/sip-4.19.6.tar.gz
+https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.13/sip-4.19.13.tar.gz
 
diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild
index dee07cb..3fc527b 100755
--- a/deps/sip/sip.SlackBuild
+++ b/deps/sip/sip.SlackBuild
@@ -26,10 +26,10 @@
 
 
 PKGNAM=sip
-VERSION=${VERSION:-4.19.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.19.13}
+BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -54,8 +54,8 @@ else
   SLKCFLAGS="-O2"
 fi
 
-PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null)
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null )
+PYTHON2VER=$(python2 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null)
+PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null )
 
 PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null)
 PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
@@ -77,27 +77,34 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ -n "${PYTHON3LIB}" ]; then
-  python3 configure.py \
-    -b "/usr/bin" \
-    -d "$PYTHON3LIB" \
-    CFLAGS="$SLKCFLAGS" \
-    CXXFLAGS="$SLKCFLAGS" || exit 1
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-
-  mv $PKG/usr/bin/sip $PKG/usr/bin/sip3
-fi
-
-python configure.py \
+python2 configure.py \
+  --sip-module PyQt5.sip \
   -b "/usr/bin" \
-  -d "$PYTHONLIB" \
+  -d "$PYTHON2LIB" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
+# Rename to avoid a clash:
+mv $PKG/usr/bin/sip $PKG/usr/bin/sip2
+
+make clean
+
+python3 configure.py \
+  --sip-module PyQt5.sip \
+  -b "/usr/bin" \
+  -d "$PYTHON3LIB" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+# Rename to avoid a clash:
+mv $PKG/usr/bin/sip $PKG/usr/bin/sip3
+
+# Create a symbolic link 'sip' pointing to the sip3 binary:
+ln -s sip3 $PKG/usr/bin/sip
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-- 
cgit v1.2.3