From nobody Thu Aug 21 00:12:54 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6kKy5Vf0z65RJX; Thu, 21 Aug 2025 00:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6kKy4cCLz40s7; Thu, 21 Aug 2025 00:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755735174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewMTzNjUmFX9Ba34WRm539RBsPE9MVis5oigkeXZQOo=; b=sZL4ljs8EHfENUiGRdK3XGOsqJpqQhvCO5C6YKCuNXbHLR5XX4Uj3imK3w0/uYIYZKg8/G t2+53OVuns1lmswZPrbh0QUKMzvkuTMilMGhgyCukOy4JZsPfmaJFUas3ekqe1BK+1nF7U lEjuNUqtPDbzabyf6RNPHHpIgm6LWuFbUVYoZHznV1OsblmIBZ8ruBos77dSll24wQnZ75 NNWz+h9i2ac+P10wPbK5C0sUGYFdN3kKBFMkWNuJi4GuXEV4050J7Q+RrUp45MVhB4Qpsg UZb0c2sUpve1+b4YAEWFQYdrAq+QB/DC1JX9KmUWGCIedIqUR19Jv7FygNiRow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755735174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewMTzNjUmFX9Ba34WRm539RBsPE9MVis5oigkeXZQOo=; b=ezN5gdL9VzV2vFA9tI2m4vJbTbeck2hRV6uIuyrSVvLHdKIrdvbJETNGJS2xWY1/6ilUfU i7oNeL9y9di1qjMvuL4c4A4KPoJOKORuzozh//qo4SstQ5XL4trXVicROlnU2aL2cucTLQ veg4kT/EH8AYS5AQ8pBsBxOsPcozPtOE6qSpYTshcN1ay6YrzSDbVtYdtxCy7d1nwCLwh6 8nUv9eEOmFV2KGuYh6wOmqadYYBI0cU3Pm4ES/FT+kCKMRAlqO1QCC6gPY3KJAlzfSHX17 ZBAYkh1E+s83ITw1txLvO4EEfseVXkZvED3lGzkWipd/celxNsTXDXwjMgJlBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755735174; a=rsa-sha256; cv=none; b=ynhf3k6dSZWVfYUUU2OFb54V7CtrRXw1tGhs/4PaYoX5Z/X9h9VpQ4RvxQf4vtZaQNr8M3 hJQSh2BqehJn0kqRQGXOrI5euL67k9hKdaWYmMUBGWzL5jsl0Hn412MllEfgLV28a0bGu+ R5zQARlgCjv0oqp9/RNvybduCA+PKryoQK5h8JKe3CUtQO6ScN0t5kWfowfKF8OavFJZGU q4g+CDmSlqkl/udIq9hOIRMynRDBv4QC+LOZfjXv4yJoJcRDuG/4aAGF2g4A+MURlNnHVd DGaE5MHMJtDueI94QBUfcIPi92PPUngMvzn62BYEiYlApg5wH/ShANntKcyIZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6kKy47wbzcJr; Thu, 21 Aug 2025 00:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57L0CsrD084640; Thu, 21 Aug 2025 00:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L0CsmG084638; Thu, 21 Aug 2025 00:12:54 GMT (envelope-from git) Date: Thu, 21 Aug 2025 00:12:54 GMT Message-Id: <202508210012.57L0CsmG084638@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: f83fa7a95730 - main - devel/qbs: Fix build on i386 [1] List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f83fa7a95730725b45fa878a125762747be9c06c Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=f83fa7a95730725b45fa878a125762747be9c06c commit f83fa7a95730725b45fa878a125762747be9c06c Author: Jason E. Hale AuthorDate: 2025-08-21 00:06:27 +0000 Commit: Jason E. Hale CommitDate: 2025-08-21 00:12:45 +0000 devel/qbs: Fix build on i386 [1] 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; } | ~~~~~~~~~~~^~~~ Add upstream patch to support -STABLE and -CURRENT. Reported by: pkg-fallout [1] --- devel/qbs/Makefile | 1 + .../files/patch-share_qbs_modules_cpp_freebsd.js | 22 ++++++++++++++++++++++ .../files/patch-src_app_qbs-setup-qt_setupqt.cpp | 4 ++-- .../patch-src_lib_corelib_tools_scripttools.h | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile index 982246a8eacb..4bf89ff0500d 100644 --- a/devel/qbs/Makefile +++ b/devel/qbs/Makefile @@ -1,6 +1,7 @@ PORTNAME= qbs DISTVERSIONPREFIX= src- DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/Qt/qbs diff --git a/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js b/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js new file mode 100644 index 000000000000..8cc059c53135 --- /dev/null +++ b/devel/qbs/files/patch-share_qbs_modules_cpp_freebsd.js @@ -0,0 +1,22 @@ +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_app_qbs-setup-qt_setupqt.cpp b/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp index 7824f9aba426..85d9fbbc44f2 100644 --- a/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp +++ b/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp @@ -1,6 +1,6 @@ ---- src/app/qbs-setup-qt/setupqt.cpp.orig 2021-11-28 22:25:29 UTC +--- src/app/qbs-setup-qt/setupqt.cpp.orig 2025-06-20 12:42:25 UTC +++ src/app/qbs-setup-qt/setupqt.cpp -@@ -70,7 +70,7 @@ static QStringList qmakeExecutableNames() +@@ -71,7 +71,7 @@ static QStringList qmakeExecutableNames() { const QString baseName = HostOsInfo::appendExecutableSuffix(QStringLiteral("qmake")); QStringList lst(baseName); diff --git a/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h b/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h new file mode 100644 index 000000000000..e573f303ff5b --- /dev/null +++ b/devel/qbs/files/patch-src_lib_corelib_tools_scripttools.h @@ -0,0 +1,20 @@ +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;