diff options
author | 2017-11-20 12:17:32 +0100 | |
---|---|---|
committer | 2017-11-20 12:17:32 +0100 | |
commit | 91229238985018e31327054b286e8f6fa52b82bd (patch) | |
tree | 04c470047fa366f7cf5f563e03fa81564a4ed737 | |
parent | fc450303a66a49761161b9a362e8307531d882ff (diff) | |
download | ktown-91229238985018e31327054b286e8f6fa52b82bd.tar.gz ktown-91229238985018e31327054b286e8f6fa52b82bd.tar.xz |
deps updated for the next release
PyQt5: version upgrade, and add Python3 support if python3 is available
on the system.
-rw-r--r-- | deps/PyQt5/.url | 2 | ||||
-rwxr-xr-x | deps/PyQt5/PyQt5.SlackBuild | 26 |
2 files changed, 26 insertions, 2 deletions
diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 77e7669..47f9852 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.tar.gz +https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.1/PyQt5_gpl-5.9.1.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index f0fd6c7..6b50832 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,7 +27,7 @@ # Modified by Eric Hameleers <alien@slackware.com> PKGNAM=PyQt5 -VERSION=${VERSION:-5.9} +VERSION=${VERSION:-5.9.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -61,6 +61,9 @@ else SLKCFLAGS="-O2" fi +PYTHONLIB=$( python -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 mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -82,6 +85,25 @@ 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_v3/ +fi + python configure.py \ --confirm-license \ --verbose \ @@ -93,6 +115,8 @@ 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/ + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |