git: 9e6501dedb4c - main - devel/qbs: Update to 3.0.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Sep 2025 23:38:35 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9e6501dedb4c7305bfbce0391688ab84f88a316d
commit 9e6501dedb4c7305bfbce0391688ab84f88a316d
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-09-03 23:30:01 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-09-03 23:38:29 +0000
devel/qbs: Update to 3.0.3
Remove upstreamed patches.
---
devel/qbs/Makefile | 3 +--
devel/qbs/distinfo | 6 +++---
.../files/patch-share_qbs_modules_cpp_freebsd.js | 22 ----------------------
.../patch-src_lib_corelib_tools_scripttools.h | 20 --------------------
4 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index 4bf89ff0500d..5d29eda711b9 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -1,7 +1,6 @@
PORTNAME= qbs
DISTVERSIONPREFIX= src-
-DISTVERSION= 3.0.1
-PORTREVISION= 1
+DISTVERSION= 3.0.3
CATEGORIES= devel
MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/Qt/qbs
diff --git a/devel/qbs/distinfo b/devel/qbs/distinfo
index 8d302c48520d..1e005315037b 100644
--- a/devel/qbs/distinfo
+++ b/devel/qbs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755242736
-SHA256 (KDE/Qt/qbs/qbs-src-3.0.1.tar.gz) = 154838d4a0647ebe9fab80bad9a8f6057c08f5723b6b06638b37cfd96bfa70be
-SIZE (KDE/Qt/qbs/qbs-src-3.0.1.tar.gz) = 5818756
+TIMESTAMP = 1756940690
+SHA256 (KDE/Qt/qbs/qbs-src-3.0.3.tar.gz) = 5ea02139263ec4dbf947d18f4a73ccc41f691ec43c5914a6a6b089d9713ec0dc
+SIZE (KDE/Qt/qbs/qbs-src-3.0.3.tar.gz) = 5796778
diff --git a/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js b/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js
deleted file mode 100644
index 8cc059c53135..000000000000
--- a/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js
+++ /dev/null
@@ -1,22 +0,0 @@
-freebsd: fix support for STABLE and CURRENT releases
-
-https://code.qt.io/cgit/qbs/qbs.git/commit/?h=3.0&id=a0dfa99c6071fede3be6522102818839a7f8365a
-
---- share/qbs/modules/cpp/freebsd.js.orig 2025-06-20 12:42:25 UTC
-+++ share/qbs/modules/cpp/freebsd.js
-@@ -1,8 +1,13 @@ function stripKernelReleaseSuffix(r) {
- var Utilities = require("qbs.Utilities");
-
- function stripKernelReleaseSuffix(r) {
-- var idx = r.indexOf("-RELEASE");
-- return idx >= 0 ? r.substr(0, idx) : r;
-+ var suffixes = ["-RELEASE", "-STABLE", "-CURRENT"];
-+ for (var i = 0; i < suffixes.length; i++) {
-+ var idx = r.indexOf(suffixes[i]);
-+ if (idx >= 0)
-+ return r.substr(0, idx);
-+ }
-+ return r;
- }
-
- function hostKernelRelease() {
diff --git a/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h b/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h
deleted file mode 100644
index e573f303ff5b..000000000000
--- a/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix build on i386.
-
-In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-3.0.1/src/lib/corelib/api/internaljobs.cpp:52:
-In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-3.0.1/src/lib/corelib/language/scriptengine.h:52:
-/wrkdirs/usr/ports/devel/qbs/work/qbs-src-3.0.1/src/lib/corelib/tools/scripttools.h:193:47: error:
-member reference base type 'const JSValue' (aka 'const unsigned long long') is not a structure or union
- 193 | operator bool() const { return m_exception.tag != JS_TAG_UNINITIALIZED; }
- | ~~~~~~~~~~~^~~~
-
---- src/lib/corelib/tools/scripttools.h.orig 2025-06-20 12:42:25 UTC
-+++ src/lib/corelib/tools/scripttools.h
-@@ -190,7 +190,7 @@ class QBS_AUTOTEST_EXPORT JsException (public)
- JsException(const JsException &) = delete;
- JsException &operator=(const JsException &) = delete;
-
-- operator bool() const { return m_exception.tag != JS_TAG_UNINITIALIZED; }
-+ operator bool() const { return !JS_IsUninitialized(m_exception); }
- QString message() const;
- const QStringList stackTrace() const;
- ErrorInfo toErrorInfo() const;