summaryrefslogtreecommitdiff
path: root/source/l/PyQt5
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-04-26 03:34:28 +0000
committerEric Hameleers <alien@slackware.com>2020-04-26 08:59:53 +0200
commite6a0a756a3947c4809450fd87c65d883efd3077f (patch)
treeecd483d4b74dc84a7b73a2974f53ed80ee23dee3 /source/l/PyQt5
parentfc0b7eb5cb49c356c545c934504f9e6b6fe37bc6 (diff)
downloadcurrent-e6a0a756a3947c4809450fd87c65d883efd3077f.tar.gz
Sun Apr 26 03:34:28 UTC 202020200426033428
d/rust-1.43.0-x86_64-2.txz: Rebuilt. Patched and recompiled with the system LLVM 10 instead of the bundled LLVM 9.
Diffstat (limited to 'source/l/PyQt5')
-rwxr-xr-xsource/l/PyQt5/PyQt5.SlackBuild39
1 files changed, 22 insertions, 17 deletions
diff --git a/source/l/PyQt5/PyQt5.SlackBuild b/source/l/PyQt5/PyQt5.SlackBuild
index 3e7d703a..c6570d2b 100755
--- a/source/l/PyQt5/PyQt5.SlackBuild
+++ b/source/l/PyQt5/PyQt5.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=PyQt5
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -100,22 +100,27 @@ export CXXFLAGS="$SLKCFLAGS"
## I see no reason at this point to include python2 support. We'll see later if
## we can get away with that or not...
-#python2 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
-#
-#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/$PYTHON2LIB/${PKGNAM}/uic/port_v3/
-#make clean
+## AND... it appears that we might not be able to, at least Plasma 5 does not
+## like to build that way, so we will add it back for now to fix using this
+## package with ktown. Better to merge Plasma in a working state (hopefully
+## soonish) and then worry about trying to get the last bits of python2 out
+## of the distribution, though honestly that may not occur until Slackware 15.1.
+python2 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
+
+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/$PYTHON2LIB/${PKGNAM}/uic/port_v3/
+make clean
python3 configure.py \
--confirm-license \