development/qbs: Updated for version 1.11.0 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 17 insertions, 19 deletions

diff --git a/development/qbs/qbs.SlackBuild b/development/qbs/qbs.SlackBuild
index b088cd4c8e..40102364cf 100644
--- a/development/qbs/qbs.SlackBuild
+++ b/development/qbs/qbs.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for qbs
+# Slackware build script for Qbs
 
 # Copyright 2014-2017 Nikos Giotis <nikos.giotis@mail.com>
+# Copyright 2018 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +23,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Changelog
-# 20170125: Updated script for version 1.7.1
-# 20170620: Updated script for version 1.8.0
-# 20170708: Updated script for version 1.8.1
-# 20170710: Missing public header patch
-#           https://codereview.qt-project.org/#/c/199668/
-#           Thanks to Andrzej Telszewski for reporting the issue upstream
-
 PRGNAM=qbs
-VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.11.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,9 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -r /usr/bin/qbs ]; then
-  echo "The qbs package needs to be removed before building"
-  echo "in order to have a successful build"
+if [ -x /usr/bin/qbs ]; then
+  echo "Please remove any previous Qbs installations before continuing."
   exit 1
 fi
 
@@ -74,7 +66,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz
+mv $PRGNAM-src-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -83,13 +76,12 @@ 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 {} \;
 
-patch -p1 < $CWD/01-corelib.qbs.patch
-patch -p1 < $CWD/02-corelib-tools.pri.patch
+patch -p0 < $CWD/corelib-tools.pri.patch
 
 # Adjust docs location.
 sed -i "s|share/doc/qbs|doc/qbs-$VERSION|g" doc/doc.pri
 
-qmake-qt5 -r qbs.pro \
+qmake-qt5 qbs.pro \
   QMAKE_CXXFLAGS="$SLKCFLAGS" \
   QBS_INSTALL_PREFIX=/usr \
   QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX \
@@ -103,8 +95,13 @@ make install_docs INSTALL_ROOT=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man/man1
+mv $PKG/usr/share/man/man1/qbs.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/qbs.1
+rm -r $PKG/usr/share/man
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LGPL_EXCEPTION.txt LICENSE.LGPLv21 LICENSE.LGPLv3 README \
+cp -a LGPL_EXCEPTION.txt LICENSE.GPL3-EXCEPT LICENSE.{LGPLv21,LGPLv3} README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -113,6 +110,7 @@ cat $CWD/qbs-config-ui.desktop > $PKG/usr/share/applications/qbs-config-ui.deskt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}