cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Qbs to 1.20.1

Browse Source
This commit is contained in:
rsadowski 2021-12-12 07:41:46 +00:00
parent 2f467570d3
commit 5ccc99e7e2
4 changed files with 6 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/qbs/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2021/12/09 05:53:50 rsadowski Exp $
# $OpenBSD: Makefile,v 1.19 2021/12/12 07:41:46 rsadowski Exp $
COMMENT = declarative cross-platform build tool
V = 1.20.0
V = 1.20.1
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
REVISION = 0
SHARED_LIBS = qbscore 8.0

4
devel/qbs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qbs-src-1.20.0.tar.gz) = RJYaS7YVgK6CGq8l67Wlc3vY+3nsBHSqJZLN1FzFFx8=
SIZE (qbs-src-1.20.0.tar.gz) = 5033322
SHA256 (qbs-src-1.20.1.tar.gz) = OjtIami8AKZwEBczzc3OZHz9w2WINm2DR7wo/RHMags=
SIZE (qbs-src-1.20.1.tar.gz) = 5034911

4
devel/qbs/patches/patch-cmake_QbsBuildConfig_cmake
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-cmake_QbsBuildConfig_cmake,v 1.1 2021/12/09 05:53:50 rsadowski Exp $
$OpenBSD: patch-cmake_QbsBuildConfig_cmake,v 1.2 2021/12/12 07:41:46 rsadowski Exp $
Do not install tests
Index: cmake/QbsBuildConfig.cmake
--- cmake/QbsBuildConfig.cmake.orig
+++ cmake/QbsBuildConfig.cmake
@@ -249,6 +249,6 @@ function(add_qbs_test test_name)
@@ -247,6 +247,6 @@ function(add_qbs_test test_name)
INSTALL_RPATH "${QBS_APP_RPATH}"
MACOSX_RPATH ${QBS_MACOSX_RPATH}
)

59
devel/qbs/patches/patch-share_qbs_module-providers_Qt_setup-qt_js
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-share_qbs_module-providers_Qt_setup-qt_js,v 1.1 2021/12/06 07:46:45 rsadowski Exp $
This comes from the upstream issue
https://bugreports.qt.io/browse/QBS-1672
and is the diff available at
https://codereview.qt-project.org/c/qbs/qbs/+/371943
adridg@: I have added the `versions` part of the code, that
additionally looks for -qt5 (which we have) and unsuffixed
and -qt (neither of which we have) executables. This matches
Index: share/qbs/module-providers/Qt/setup-qt.js
--- share/qbs/module-providers/Qt/setup-qt.js.orig
+++ share/qbs/module-providers/Qt/setup-qt.js
@@ -53,23 +53,29 @@ function getQmakeFilePaths(qmakeFilePaths, qbs) {
if (qmakeFilePaths && qmakeFilePaths.length > 0)
return qmakeFilePaths;
console.info("Detecting Qt installations...");
- var pathValue = Environment.getEnv("PATH");
- if (!pathValue)
- return [];
- var dirs = splitNonEmpty(pathValue, qbs.pathListSeparator);
- var suffix = exeSuffix(qbs);
var filePaths = [];
- for (var i = 0; i < dirs.length; ++i) {
- var candidate = FileInfo.joinPaths(dirs[i], "qmake" + suffix);
- var canonicalCandidate = FileInfo.canonicalPath(candidate);
- if (!canonicalCandidate || !File.exists(canonicalCandidate))
- continue;
- if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
- candidate = canonicalCandidate;
- if (!filePaths.contains(candidate)) {
- console.info("Found Qt at '" + toNative(candidate) + "'.");
- filePaths.push(candidate);
+ var pathValue = Environment.getEnv("PATH");
+ if (pathValue) {
+ var dirs = splitNonEmpty(pathValue, qbs.pathListSeparator);
+ var versions = ["", "-qt5", "-qt4"];
+ var suffix = exeSuffix(qbs);
+ for (var i = 0; i < dirs.length; ++i) { for (var iver = 0; iver < versions.length; ++iver) {
+ var candidate = FileInfo.joinPaths(dirs[i], "qmake" + versions[iver] + suffix);
+ var canonicalCandidate = FileInfo.canonicalPath(candidate);
+ if (!canonicalCandidate || !File.exists(canonicalCandidate))
+ continue;
+ if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
+ candidate = canonicalCandidate;
+ if (!filePaths.contains(candidate)) {
+ console.info("Found Qt at '" + toNative(candidate) + "'.");
+ filePaths.push(candidate);
+ } }
}
+ }
+ if (filePaths.length === 0) {
+ console.warn("Could not find any qmake executables in PATH. Either make sure a qmake "
+ + "executable is present in PATH or set the moduleProviders.Qt.qmakeFilePaths property "
+ + "to point a qmake executable.");
}
return filePaths;
}