diff options
author | Eric Hameleers <alien@slackware.com> | 2018-10-24 16:48:47 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-10-24 16:48:47 +0200 |
commit | 044a706cdff5a0a8f8dc02b9be084cd196dbcfca (patch) | |
tree | 8e1f219bc918fa097335b7ab06ee8cd71e398799 /deps/QScintilla | |
parent | da33bca8208d3134ebebac8e88d1010eabcda579 (diff) | |
download | ktown-044a706cdff5a0a8f8dc02b9be084cd196dbcfca.tar.gz ktown-044a706cdff5a0a8f8dc02b9be084cd196dbcfca.tar.xz |
Fixed missing PyQt4 support in sip. Recompiled QScintilla against sip.
This also makes the HPLIP systray applet work again.
Diffstat (limited to 'deps/QScintilla')
-rwxr-xr-x | deps/QScintilla/QScintilla.SlackBuild | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild index db7be4e..dd7a072 100755 --- a/deps/QScintilla/QScintilla.SlackBuild +++ b/deps/QScintilla/QScintilla.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=QScintilla VERSION=${VERSION:-2.10.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} @@ -170,26 +170,26 @@ cd designer-Qt4Qt5 make install INSTALL_ROOT=$PKG || exit 1 cd - -#cd Python -# echo "-- >> Python --" -# python3 configure.py \ -# --verbose \ -# --qmake /usr/bin/qmake \ -# -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ -# || exit 1 -# make -j1 || exit 1 -# make -j1 install INSTALL_ROOT=$PKG || exit 1 -# -# make clean || exit 1 -# -# python2 configure.py \ -# --verbose \ -# --qmake /usr/bin/qmake \ -# -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ -# || exit 1 -# make -j1 || exit 1 -# make -j1 install INSTALL_ROOT=$PKG || exit 1 -#cd - +cd Python + echo "-- >> Python --" + python3 configure.py \ + --verbose \ + --qmake /usr/bin/qmake \ + -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ + || exit 1 + make -j1 || exit 1 + make -j1 install INSTALL_ROOT=$PKG || exit 1 + + make clean || exit 1 + + python2 configure.py \ + --verbose \ + --qmake /usr/bin/qmake \ + -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ + || exit 1 + make -j1 || exit 1 + make -j1 install INSTALL_ROOT=$PKG || exit 1 +cd - # Link the shared libraries into /usr/lib${LIBDIRSUFFIX}: ( cd $PKG/usr/lib${LIBDIRSUFFIX} |