diff options
author | Eric Hameleers <alien@slackware.com> | 2019-02-14 22:32:30 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-02-14 22:32:30 +0100 |
commit | a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc (patch) | |
tree | e557a387cf9d6004b0b6b1a03b63c8ce930454d9 /deps/PyQt | |
parent | 335621ea519b61e6fed5eaf82b1ccc5ebdb1afec (diff) | |
download | ktown-a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc.tar.gz ktown-a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc.tar.xz |
Updated deps for the next ktown release
libxkbcommon: updated to 0.8.3
qt5: updated to 5.12.1
qt5-webkit: recompiled against the new qt5
sip: updated to 4.19.14
PyQt: updated to 4.12.3 (only managed to compile on 64bit)
PyQt5: updated to 5.12
QScintilla: updated to 2.11 (dropped the Qt4 support which would not compile)
Diffstat (limited to '')
-rw-r--r-- | deps/PyQt/.url | 2 | ||||
-rwxr-xr-x | deps/PyQt/PyQt.SlackBuild | 15 | ||||
-rw-r--r-- | deps/PyQt5/.deps | 3 | ||||
-rw-r--r-- | deps/PyQt5/.url | 2 | ||||
-rwxr-xr-x | deps/PyQt5/PyQt5.SlackBuild | 6 |
5 files changed, 19 insertions, 9 deletions
diff --git a/deps/PyQt/.url b/deps/PyQt/.url index 7db5c55..8e479e7 100644 --- a/deps/PyQt/.url +++ b/deps/PyQt/.url @@ -1 +1 @@ -http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.1/PyQt4_gpl_x11-4.12.1.tar.gz +http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild index 8c188b1..2c55e12 100755 --- a/deps/PyQt/PyQt.SlackBuild +++ b/deps/PyQt/PyQt.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=PyQt -VERSION=${VERSION:-4.12.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.12.3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -91,11 +91,15 @@ find . \ # This avoids compiling a version number into KDE's .la files: export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt +export QT4DIR=/usr/lib${LIBDIRSUFFIX}/qt export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -python3 configure.py --confirm-license --verbose +python3 configure.py \ + --confirm-license \ + --qsci-api \ + --verbose make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 make clean @@ -103,7 +107,10 @@ make clean mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3 rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/ -python2 configure.py --confirm-license --verbose +python2 configure.py \ + --confirm-license \ + --qsci-api \ + --verbose make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 diff --git a/deps/PyQt5/.deps b/deps/PyQt5/.deps new file mode 100644 index 0000000..64526d1 --- /dev/null +++ b/deps/PyQt5/.deps @@ -0,0 +1,3 @@ +python-enum34 +qt5 +sip diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 00e3b3e..4bf101b 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.11.3/PyQt5_gpl-5.11.3.tar.gz +https://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-5.12.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index 29cd009..b1eb9ec 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.11.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.12} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} CWD=$(pwd) TMP=${TMP:-/tmp} |