summaryrefslogtreecommitdiffstats
path: root/deps/QScintilla/QScintilla.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-08-06 14:29:25 +0200
committer Eric Hameleers <alien@slackware.com>2019-08-06 14:29:25 +0200
commitfaa80e7dad4c49ff3fb490a3c7f9c66ca6fe0ba5 (patch)
tree1611d9007bd4038967b4accd47c7c74feb9f614b /deps/QScintilla/QScintilla.SlackBuild
parenta79971a373c115f48bc38cfecd532f77bfa293c1 (diff)
downloadktown-faa80e7dad4c49ff3fb490a3c7f9c66ca6fe0ba5.tar.gz
ktown-faa80e7dad4c49ff3fb490a3c7f9c66ca6fe0ba5.tar.xz
Packages rebuilt/upgraded due to newer ffmpeg/libevent in -current
Deps: - rebuilt qt5 (for the new libevent). - rebuilt OpenAL and mlt (for the new ffmpeg). - upgraded opencv, qrencode, qtav, sip and QScintilla. - removed PyQT (since this now properly landed in -current) Frameworks: - rebuilt prison (for the new qrencode) and kfilemetadata5 (new ffmpeg). Plasma: - rebuilt ksysguard (for the new libevent). Applications: - rebuilt ffmpegthumbs and k3b (for the new ffmpeg). Applications-extra: - upgraded digikam and krita.
Diffstat (limited to 'deps/QScintilla/QScintilla.SlackBuild')
-rwxr-xr-xdeps/QScintilla/QScintilla.SlackBuild10
1 files changed, 4 insertions, 6 deletions
diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild
index 1ddc363..6f56e9d 100755
--- a/deps/QScintilla/QScintilla.SlackBuild
+++ b/deps/QScintilla/QScintilla.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for QScintilla
# Copyright 2008 Robby Workman <rworkman@slackware.com> Northport, AL, USA
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,10 +28,10 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=QScintilla
-VERSION=${VERSION:-2.11.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.11.2}
+BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -149,8 +149,6 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
make clean -C Python || exit 1
fi
-# QT4 SUPPORT CURRENTLY DOES NOT COMPILE...
-# /usr/lib64/qt/include/QtCore/qglobal.h:2242:20: error: invalid application of 'sizeof' to incomplete type 'QUrl'
# QT4 support:
echo "-- Compiling Qt4 support --"
cd Qt4Qt5