summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
author Benjamin Trigona-Harany2020-02-24 19:22:45 +0100
committer Willy Sudiarto Raharjo2020-02-29 01:45:16 +0100
commit6ea773407cde48fafcb02e844fcd38bc4fbaa121 (patch)
treee9dee62e81da5389ba493cfe253bb39121231787 /libraries
parent2191320c022a18590cd3a91caf6c9481e34ffcbe (diff)
downloadslackbuilds-6ea773407cde48fafcb02e844fcd38bc4fbaa121.tar.gz
libraries/QScintilla-qt5: Updated for version 2.11.4.
Diffstat (limited to 'libraries')
-rw-r--r--libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild14
-rw-r--r--libraries/QScintilla-qt5/QScintilla-qt5.info6
2 files changed, 10 insertions, 10 deletions
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
index 98b0e79f9f..c8a457646c 100644
--- a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
+++ b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for QScintilla-qt5
-# Copyright 2020 Benjamin Trigona-Harant <slackbuilds@jaxartes.net>
+# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=QScintilla-qt5
SRCNAM=QScintilla
-VERSION=${VERSION:-2.11.3}
+VERSION=${VERSION:-2.11.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,20 +70,20 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+export QMAKEFEATURES=$TMP/$SRCNAM-$VERSION/Qt4Qt5/features/
+
cd Qt4Qt5
- qmake-qt5 qscintilla.pro
+ qmake-qt5 qscintilla.pro QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11"
make install INSTALL_ROOT=$PKG
cd -
cd designer-Qt4Qt5
- qmake-qt5 designer.pro INCLUDEPATH+=$PKG/usr/include/qt5 QMAKE_LIBDIR+=$PKG/usr/lib${LIBDIRSUFFIX}
+ qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11"
make install INSTALL_ROOT=$PKG
cd -
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())")
+ python3 configure.py --pyqt=PyQt5 -c --qmake /usr/bin/qmake-qt5 -n ../Qt4Qt5 -o ../Qt4Qt5 --sip=/usr/bin/python3-sip -c
make install INSTALL_ROOT=$PKG -j1
cd -
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.info b/libraries/QScintilla-qt5/QScintilla-qt5.info
index da0cb84c36..e5bb756901 100644
--- a/libraries/QScintilla-qt5/QScintilla-qt5.info
+++ b/libraries/QScintilla-qt5/QScintilla-qt5.info
@@ -1,8 +1,8 @@
PRGNAM="QScintilla-qt5"
-VERSION="2.11.3"
+VERSION="2.11.4"
HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla"
-DOWNLOAD="https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.3/QScintilla-2.11.3.tar.gz"
-MD5SUM="53e87914d3796caafd6236a1c3a56d74"
+DOWNLOAD="https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz"
+MD5SUM="d750d9143b0697df2e4662cea3efd20d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3-PyQt5"