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/PyQt5/.url             |  2 +-
 deps/PyQt5/PyQt5.SlackBuild | 51 +++++++++++++++++++--------------------------
 2 files changed, 23 insertions(+), 30 deletions(-)

(limited to 'deps/PyQt5')

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
 
-- 
cgit v1.2.3