From 1e5c2b2e2860b59201490712a2dd87c43f4a42fd Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Mon, 18 Nov 2019 21:51:08 -0800 Subject: libraries/QScintilla-qt5: Updated for version 2.11.3. --- libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild | 19 ++++++------------- libraries/QScintilla-qt5/QScintilla-qt5.info | 6 +++--- libraries/QScintilla-qt5/README | 4 +++- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild index f922b9ad7e..38a1ce337c 100644 --- a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild +++ b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=QScintilla-qt5 -SRCNAM=QScintilla_gpl -VERSION=${VERSION:-2.10.2} +SRCNAM=QScintilla +VERSION=${VERSION:-2.11.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,16 +80,9 @@ cd designer-Qt4Qt5 make install INSTALL_ROOT=$PKG cd - -cp -r Python Python3 -# QScintilla 2.10.2 is not compatible with Slackware 14.2's version of sip -#cd Python -# python configure.py --pyqt=PyQt5 -c --qmake /usr/bin/qmake-qt5 -n $PKG/usr/include/qt5 -o $PKG/usr/lib${LIBDIRSUFFIX} --sip=/usr/bin/sip --sip-incdir=/usr/include/python2.7 -# make install INSTALL_ROOT=$PKG -#cd - - -cd Python3 - sed -i "1423i\ pro.write('INCLUDEPATH += /usr/include/qt5/QtWidgets\\\n')" configure.py - sed -i "1423i\ pro.write('INCLUDEPATH += /usr/include/qt5/QtPrintSupport\\\n')" configure.py +cd Python + sed -i "1613i\ pro.write('INCLUDEPATH += /usr/include/qt5/QtWidgets\\\n')" configure.py + sed -i "1613i\ pro.write('INCLUDEPATH += /usr/include/qt5/QtPrintSupport\\\n')" configure.py python3 configure.py --pyqt=PyQt5 -c --qmake /usr/bin/qmake-qt5 -n $PKG/usr/include/qt5 -o $PKG/usr/lib${LIBDIRSUFFIX} --sip=/usr/bin/python3-sip --sip-incdir=/usr/include/python$(python3 -c "from distutils.sysconfig import get_python_version; print(get_python_version())") make install INSTALL_ROOT=$PKG cd - @@ -99,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - LICENSE NEWS README \ + ChangeLog LICENSE NEWS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.info b/libraries/QScintilla-qt5/QScintilla-qt5.info index 2f08fe6c4b..da0cb84c36 100644 --- a/libraries/QScintilla-qt5/QScintilla-qt5.info +++ b/libraries/QScintilla-qt5/QScintilla-qt5.info @@ -1,8 +1,8 @@ PRGNAM="QScintilla-qt5" -VERSION="2.10.2" +VERSION="2.11.3" HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla" -DOWNLOAD="https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10.2/QScintilla_gpl-2.10.2.tar.gz" -MD5SUM="0d2b25ad607f93453c37478e83ec4640" +DOWNLOAD="https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.3/QScintilla-2.11.3.tar.gz" +MD5SUM="53e87914d3796caafd6236a1c3a56d74" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-PyQt5" diff --git a/libraries/QScintilla-qt5/README b/libraries/QScintilla-qt5/README index 2824761f20..4d197996f7 100644 --- a/libraries/QScintilla-qt5/README +++ b/libraries/QScintilla-qt5/README @@ -6,4 +6,6 @@ choices are more open than with many editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours, and multiple fonts. -This script provides QScintilla for Python 3 only. +Building qscintilla-qt5 while an older verion is installed can cause run-time +errors. To avoid issues, unistall the current package before running this +script. -- cgit v1.2.3