diff options
Diffstat (limited to 'devel/qbs/files')
| -rw-r--r-- | devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js | 22 | ||||
| -rw-r--r-- | devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h | 20 |
2 files changed, 0 insertions, 42 deletions
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; |
