diff options
Diffstat (limited to 'development/qbs')
| -rw-r--r-- | development/qbs/01-corelib.qbs.patch | 20 | ||||
| -rw-r--r-- | development/qbs/02-corelib-tools.pri.patch | 14 | ||||
| -rw-r--r-- | development/qbs/qbs.SlackBuild | 13 | ||||
| -rw-r--r-- | development/qbs/qbs.info | 6 |
4 files changed, 47 insertions, 6 deletions
diff --git a/development/qbs/01-corelib.qbs.patch b/development/qbs/01-corelib.qbs.patch new file mode 100644 index 0000000000..dc76cbbe37 --- /dev/null +++ b/development/qbs/01-corelib.qbs.patch @@ -0,0 +1,20 @@ +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" diff --git a/development/qbs/02-corelib-tools.pri.patch b/development/qbs/02-corelib-tools.pri.patch new file mode 100644 index 0000000000..c0f66a1c36 --- /dev/null +++ b/development/qbs/02-corelib-tools.pri.patch @@ -0,0 +1,14 @@ +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 + } diff --git a/development/qbs/qbs.SlackBuild b/development/qbs/qbs.SlackBuild index 69da8cf85d..b088cd4c8e 100644 --- a/development/qbs/qbs.SlackBuild +++ b/development/qbs/qbs.SlackBuild @@ -24,11 +24,15 @@ # Changelog # 20170125: Updated script for version 1.7.1 -# 2017XXYY: Updated script for version 1.8.0 +# 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.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.8.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -79,6 +83,9 @@ 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 + # Adjust docs location. sed -i "s|share/doc/qbs|doc/qbs-$VERSION|g" doc/doc.pri diff --git a/development/qbs/qbs.info b/development/qbs/qbs.info index 31f8278ddd..6b89e8ebe1 100644 --- a/development/qbs/qbs.info +++ b/development/qbs/qbs.info @@ -1,8 +1,8 @@ PRGNAM="qbs" -VERSION="1.8.0" +VERSION="1.8.1" HOMEPAGE="http://qt-project.org/wiki/qbs" -DOWNLOAD="https://github.com/qt-labs/qbs/archive/v1.8.0/qbs-1.8.0.tar.gz" -MD5SUM="928deb848b406c64ced62bfcf0c1b796" +DOWNLOAD="https://github.com/qt-labs/qbs/archive/v1.8.1/qbs-1.8.1.tar.gz" +MD5SUM="f571ae89a767d488710f2a4df878abad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" |