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

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
Andrzej Telszewski 2018-04-27 09:04:45 +01:00 committed by Willy Sudiarto Raharjo
parent c721b37c56
commit 91708a5ee5
8 changed files with 50 additions and 80 deletions

View file

@ -1,20 +0,0 @@
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 1b13792..6dd6f08 100644 (file)
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -405,7 +405,6 @@ QbsLibrary {
"stlutils.h",
"toolchains.cpp",
"version.cpp",
- "version.h",
"visualstudioversioninfo.cpp",
"visualstudioversioninfo.h",
"vsenvironmentdetector.cpp",
@@ -435,6 +434,7 @@ QbsLibrary {
"settingsmodel.h",
"setupprojectparameters.h",
"toolchains.h",
+ "version.h",
]
qbs.install: qbsbuildconfig.installApiHeaders
qbs.installDir: headerInstallPrefix + "/tools"

View file

@ -1,14 +0,0 @@
diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
index 0fa9114..fb0c225 100644 (file)
--- a/src/lib/corelib/tools/tools.pri
+++ b/src/lib/corelib/tools/tools.pri
@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
$$PWD/generatorpluginmanager.h \
$$PWD/installoptions.h \
$$PWD/setupprojectparameters.h \
- $$PWD/toolchains.h
+ $$PWD/toolchains.h \
+ $$PWD/version.h
tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
INSTALLS += tools_headers
}

View file

@ -1,19 +1,12 @@
QBS - The Qt Build Suite
Qbs is a build automation tool designed to conveniently manage the build
process of software projects across multiple platforms. Qbs can be used
for any software project, regardless of programming language, toolkit or
libraries used.
Qt Build Suite (Qbs) is a tool that helps simplify the build process for
developing projects across multiple platforms. Qbs can be used for any
software project, whether it is written in Qt or not.
NOTES:
1. Remove any previous Qbs installations before building this package.
Qbs is an all-in-one tool that generates a build graph from a high-level
project description (like qmake or cmake) and additionally undertakes
the task of executing the commands in the low-level build graph (like make).
Notes:
1. Please remove any previous version of qbs before building.
2. Sometimes the old qbs profiles do not work when updating qbs.
These files are located in the ~/.config/QtProject/qbs directory.
2. Sometimes the old Qbs profiles do not work with updated version of
Qbs. These files are located in ~/.config/QtProject/qbs directory.
Deleting this directory and recreating the profiles is a possible
workround.
workaround.

View file

@ -0,0 +1,10 @@
--- src/lib/corelib/tools/tools.pri.orig 2018-03-27 13:40:50.000000000 +0200
+++ src/lib/corelib/tools/tools.pri 2018-04-21 22:01:02.214730669 +0200
@@ -126,6 +126,7 @@
$$PWD/installoptions.h \
$$PWD/qbspluginmanager.h \
$$PWD/setupprojectparameters.h \
+ $$PWD/projectgeneratormanager.h \
$$PWD/toolchains.h \
$$PWD/version.h
tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools

View file

@ -0,0 +1,3 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi

View file

@ -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}

View file

@ -1,10 +1,10 @@
PRGNAM="qbs"
VERSION="1.8.1"
HOMEPAGE="http://qt-project.org/wiki/qbs"
DOWNLOAD="https://github.com/qt-labs/qbs/archive/v1.8.1/qbs-1.8.1.tar.gz"
MD5SUM="b5e9df685b14852d1846898414c1b7b9"
VERSION="1.11.0"
HOMEPAGE="https://wiki.qt.io/Qbs"
DOWNLOAD="https://download.qt.io/official_releases/qbs/1.11.0/qbs-src-1.11.0.tar.gz"
MD5SUM="d73fb33a4614e626792182e66c67c46d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
MAINTAINER="Nikos Giotis"
EMAIL="nikos.giotis@gmail.com"
MAINTAINER="Andrzej Telszewski"
EMAIL="atelszewski@gmail.com"

View file

@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
qbs: qbs (Qt Build Suite)
qbs:
qbs: Qt Build Suite (Qbs) is a tool that helps simplify the build process
qbs: for developing projects across multiple platforms. Qbs can be used for
qbs: any software project, whether it is written in Qt or not.
qbs: Qbs is a build automation tool designed to conveniently manage
qbs: the build process of software projects across multiple platforms.
qbs: Qbs can be used for any software project, regardless of programming
qbs: language, toolkit or libraries used.
qbs:
qbs:
qbs: Homepage: http://wiki.qt.io/Qt_Build_Suite
qbs: Homepage: https://wiki.qt.io/Qbs
qbs:
qbs:
qbs: