diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-03-06 21:40:28 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-03-06 21:40:28 +0100 |
| commit | 338b3b02b7bb7e3f8bde1645c694c2b6c6d42b11 (patch) | |
| tree | f56ea069f35e91dcd1af1c09b909c0bc3d135bee | |
| parent | 704ee65583cad0713567c8f787c3f531045b9315 (diff) | |
| download | ktown-KDE-5_18.03.tar.gz ktown-KDE-5_18.03.tar.xz | |
deps/PyQt5: remove the correct bitsKDE-5_18.03
I messed up on several levels. The python2 version should use port_v2
and python3 version should use port_v3. The others can be safely removed:
- rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v3/
- rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/
+ rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/
+ rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/
| -rwxr-xr-x | deps/PyQt5/PyQt5.SlackBuild | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index b24bc5c..e64a29f 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -101,7 +101,7 @@ if [ -n "${PYTHON3LIB}" ]; then 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_v3/ + rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ fi python configure.py \ @@ -115,7 +115,7 @@ make $NUMJOBS || make || exit 1 # INSTALL_ROOT is needed to install libpyqt4.so properly: make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ +rm -rf $PKG/$PYTHONLIB/${PKGNAM}/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 |