mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-15 03:14:23 +00:00
devel/qbs: update to 1.21, latest upstream
There's no release notes for this, but portscout spotted it (and fedora packages it as well, already). Bump qtcreator, which is the only consumer of the library / buildsystem.
This commit is contained in:
Adriaan de Groot
parent
ef9735203e
commit
7f39b57153
@ -1,6 +1,6 @@
|
||||
PORTNAME= qbs
|
||||
DISTVERSIONPREFIX= src-
|
||||
DISTVERSION= 1.20.0
|
||||
DISTVERSION= 1.21.0
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION}
|
||||
DIST_SUBDIR= KDE/Qt/qbs
|
||||
@ -14,8 +14,8 @@ LICENSE_COMB= dual
|
||||
USES= compiler:c++11-lib gl python:run qmake:outsource qt:5 shebangfix
|
||||
USE_GL= gl
|
||||
USE_LDCONFIG= yes
|
||||
USE_QT= buildtools_build core concurrent gui network script testlib \
|
||||
widgets xml
|
||||
USE_QT= core concurrent gui network script widgets xml \
|
||||
buildtools_build testlib_build
|
||||
|
||||
SHEBANG_FILES= src/3rdparty/python/bin/dmgbuild
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1638137269
|
||||
SHA256 (KDE/Qt/qbs/qbs-src-1.20.0.tar.gz) = 44961a4bb61580ae821aaf25ebb5a5737bd8fb79ec0474aa2592cdd45cc5171f
|
||||
SIZE (KDE/Qt/qbs/qbs-src-1.20.0.tar.gz) = 5033322
|
||||
TIMESTAMP = 1639525080
|
||||
SHA256 (KDE/Qt/qbs/qbs-src-1.21.0.tar.gz) = bfed9d93f94989986dd72e81fac5f39e30de058431133a21aaf9971455b335e7
|
||||
SIZE (KDE/Qt/qbs/qbs-src-1.21.0.tar.gz) = 5082730
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
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
|
||||
the code in the setupqt.cpp files, elsewhere.
|
||||
|
||||
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
|
||||
index b1239a7..422863b 100644
|
||||
--- share/qbs/module-providers/Qt/setup-qt.js
|
||||
+++ share/qbs/module-providers/Qt/setup-qt.js
|
||||
@@ -53,24 +53,30 @@
|
||||
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;
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ include/qbs/use_installed_corelib.pri
|
||||
lib/libqbscore.prl
|
||||
lib/libqbscore.so
|
||||
lib/libqbscore.so.1
|
||||
lib/libqbscore.so.1.20
|
||||
lib/libqbscore.so.1.21
|
||||
lib/libqbscore.so.%%SHLIB_VERSION%%
|
||||
lib/qbs/plugins/libclangcompilationdbgenerator.so
|
||||
lib/qbs/plugins/libiarewgenerator.so
|
||||
@ -141,6 +141,7 @@ share/man/man1/qbs.1.gz
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbs.qhp.sha1
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbsconvenienceitems-qmlmodule.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbslanguageitems-qmlmodule.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbsmoduleproviders-qmlmodule.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbsmodules-qmlmodule.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qbsprobes-qmlmodule.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsconvenienceitems-appleapplicationdiskimage-members.html
|
||||
@ -215,6 +216,10 @@ share/man/man1/qbs.1.gz
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbslanguageitems-scanner.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbslanguageitems-subproject-members.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbslanguageitems-subproject.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmoduleproviders-qbspkgconfig-members.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmoduleproviders-qbspkgconfig.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmoduleproviders-qt-members.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmoduleproviders-qt.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-android-ndk-members.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-android-ndk.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-android-sdk-members.html
|
||||
@ -558,6 +563,8 @@ share/man/man1/qbs.1.gz
|
||||
%%DATADIR%%/examples/install-bundle/main.cpp
|
||||
%%DATADIR%%/examples/install-bundle/white.iconset/icon_16x16.png
|
||||
%%DATADIR%%/examples/install-bundle/white.iconset/icon_16x16@2x.png
|
||||
%%DATADIR%%/examples/pkgconfig-provider/main.c
|
||||
%%DATADIR%%/examples/pkgconfig-provider/pkgconfig-provider.qbs
|
||||
%%DATADIR%%/examples/protobuf/addressbook_cpp/README.md
|
||||
%%DATADIR%%/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
|
||||
%%DATADIR%%/examples/protobuf/addressbook_cpp/main.cpp
|
||||
@ -658,6 +665,7 @@ share/man/man1/qbs.1.gz
|
||||
%%DATADIR%%/module-providers/Qt/templates/scxml.qbs
|
||||
%%DATADIR%%/module-providers/__fallback/fallback.qbs
|
||||
%%DATADIR%%/module-providers/__fallback/provider.qbs
|
||||
%%DATADIR%%/module-providers/qbspkgconfig.qbs
|
||||
%%DATADIR%%/modules/Android/android-utils.js
|
||||
%%DATADIR%%/modules/Android/ndk/ndk.qbs
|
||||
%%DATADIR%%/modules/Android/ndk/utils.js
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
PORTNAME= qtcreator
|
||||
DISTVERSION= 5.0.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
|
||||
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user