3 files changed, 47 insertions, 23 deletions
diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild
index 2e2d9654..6b70950e 100755
--- a/source/l/QScintilla/QScintilla.SlackBuild
+++ b/source/l/QScintilla/QScintilla.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for QScintilla
 
 # Copyright 2008  Robby Workman <rworkman@slackware.com> Northport, AL, USA
-# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=QScintilla
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo ${PKGNAM}_*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -45,6 +46,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -65,9 +74,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAM-gpl-$VERSION
-tar xvf $CWD/$PKGNAM-gpl-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-gpl-$VERSION || exit 1
+rm -rf ${PKGNAM}_gpl-$VERSION
+tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z || exit 1
+cd ${PKGNAM}_gpl-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,23 +85,37 @@ find . \
  -exec chmod 644 {} \;
 
 cd Qt4Qt5
-  qmake -o Makefile qscintilla.pro
-  make $NUMJOBS
-  make install INSTALL_ROOT=$PKG
+  qmake \
+    -o Makefile \
+    QMAKE_CFLAGS+="$SLKCFLAGS" \
+    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
+    qscintilla.pro || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
   # Yes, we'll spam the dev environment so we can build the other parts.
-  make install
+  make install || exit 1
 cd -
 
 cd designer-Qt4Qt5
-  qmake -o Makefile designer.pro
-  make $NUMJOBS
-  make install INSTALL_ROOT=$PKG
+  qmake \
+    -o Makefile \
+    QMAKE_CFLAGS+="$SLKCFLAGS" \
+    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
+    designer.pro || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
 cd -
 
 cd Python
-  python configure.py
-  make $NUMJOBS
-  make install INSTALL_ROOT=$PKG
+  python3 configure.py || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
+
+  make clean || exit 1
+
+  python configure.py || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
 cd -
 
 # Link the shared libraries into /usr/lib${LIBDIRSUFFIX}:
diff --git a/source/l/QScintilla/QScintilla.url b/source/l/QScintilla/QScintilla.url
new file mode 100644
index 00000000..ef3134cc
--- /dev/null
+++ b/source/l/QScintilla/QScintilla.url
@@ -0,0 +1 @@
+http://www.riverbankcomputing.co.uk/software/qscintilla/
diff --git a/source/l/QScintilla/slack-desc b/source/l/QScintilla/slack-desc
index f6edc094..cb3fdd3e 100644
--- a/source/l/QScintilla/slack-desc
+++ b/source/l/QScintilla/slack-desc
@@ -1,18 +1,18 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
           |-----handy-ruler--------------------------------------------------|
 QScintilla: QScintilla (Qt port of the Scintilla C++ editor control)
 QScintilla:
 QScintilla: QScintilla includes features especially useful when editing and 
-QScintilla: debugging source code.  These include support for syntax styling, 
-QScintilla: error indicators, code completion, and call tips.  The selection 
+QScintilla: debugging source code. These include support for syntax styling, 
+QScintilla: error indicators, code completion, and call tips. The selection 
 QScintilla: margin can contain markers like those used in debuggers to 
-QScintilla: indicate breakpoints and the current line.  Styling choices are 
+QScintilla: indicate breakpoints and the current line. Styling choices are 
 QScintilla: more open than with many editors, allowing the use of 
 QScintilla: proportional fonts, bold and italics, multiple foreground and 
 QScintilla: background colours, and multiple fonts.