From nobody Fri Mar 13 08:34:43 2026 X-Original-To: dev-commits-ports-all@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 4fXHpq47BXz6Vhl5 for ; Fri, 13 Mar 2026 08:34:43 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXHpq2dnjz3y1M for ; Fri, 13 Mar 2026 08:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773390883; 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=/w/PLv+/FK803Lmsa2oRJSxZXufeIkwtoqRxSG1Iq3c=; b=b1WfWyfvKShO+C5G0hQFfVtclteYYTf/Y3cwKo/7DqMIBY4vmSyB/AhZQZEQqPf5Bygg6e okIggpcayc8GXaanGEIZZaWn3WnT2nCcunzyDRKP383gnwkpYG6VHAmpHr1OA7ZT5/EAW4 uhWj9b7ZTHHY2rdLmauHK64UREz7ujztuUsCYfqkxI/pXH5Wk69J40SWArAyTWGwTiC2/n Mt3QHLVoLAW2BM0YWd3VGoZvu4IawgSFfUZEpaSldhCcx9hrg8JzHSFREs6rJ1Uziz4JJi Va6wDdftO/opCJyMEvmwqe7Shgpa87Hy6nzm2/wY7col7yNQ3GpVj1sC+gvLlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773390883; a=rsa-sha256; cv=none; b=CjjCBiQvSczY76W1KAaXCdSDaX29mMxU4jg55yWm5lqT4M9T++szAadDAVwocX8AYc4J8m DoSPeC3moF7XmbJsUShFid/0WRsMAd0tn3FaRWd3ak6cGiC6yCD8OLlFaalLeXAwlefRcH beSrQMpi7PmIByITBtux8I41zwxMZ6ezQlJWhq8G2CbtQK/HT7AfSCFGQgBvC8iNkRvrs7 H+lzXzSrKh6d3V+9jTYbLGUH7C7grYXGJwH9YDcUtdpiRcoD10k9I6D5LeVD2JXtcXPkUp 7Gv6QePJHj9EYdodyTF5XrHCcCCVQO4TOIxNQ13RajOxwOg/+QpeNL9Z7PyiGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773390883; 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=/w/PLv+/FK803Lmsa2oRJSxZXufeIkwtoqRxSG1Iq3c=; b=t8CzsvlYrvvmzzC0GQJEGuhAX9mVOB5Y2eR5PWJGzgYg2IrHveK5W3nEKE3afHqMfXC333 bzNaMIcd0LYqlnsUQJvGnpkUwM66lWL8DWaOaoQikm4G+IFiIYEkKaa1a2rw8M4qSeMKbO ltGXBBqoRv9TAXnYa+2fYo9xwK1BVCtgKbIP8bXN6wdkrAdJIDONzPXzCYrBu6Cl8Kqo7x G9uvO+Y24I90LmZh0JzKzD5Lz+u/z32bMVWM4QHdYHtHkdLFcFND9xY5HmKt7m4O1SSQ8s +d2nP5R2zSP/W8XfJYk78IvFY59QP5Oeaw0iPdfqQaQlti//FUW/PEku7LLadA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXHpq2BPwz8cS for ; Fri, 13 Mar 2026 08:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39864 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 08:34:43 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: d92ebd379aa5 - 2026Q1 - devel/catch: fix build with clang 21 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q1 X-Git-Reftype: branch X-Git-Commit: d92ebd379aa5c7098ce4ba2aab8ca7fd2f8f3657 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 08:34:43 +0000 Message-Id: <69b3cc23.39864.4d2ab5e8@gitrepo.freebsd.org> The branch 2026Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=d92ebd379aa5c7098ce4ba2aab8ca7fd2f8f3657 commit d92ebd379aa5c7098ce4ba2aab8ca7fd2f8f3657 Author: Dimitry Andric AuthorDate: 2026-02-25 19:21:07 +0000 Commit: Dimitry Andric CommitDate: 2026-03-13 08:34:37 +0000 devel/catch: fix build with clang 21 With clang 21 devel/catch fails to build, with errors similar to: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:95:32: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 95 | constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { | ~~~~~~~~~~~~^~~ | operator""_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:100:28: error: identifier '_catch_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 100 | constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { | ~~~~~~~~~~~~^~~~~~~~~ | operator""_catch_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/IntrospectiveTests/String.tests.cpp:144:33: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 144 | using Catch::operator"" _sr; | ~~~~~~~~~~~^~~ | operator""_sr and later: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:13:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 13 | MyType1& operator=(MyType1 const&) { throw 3; } | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:18:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 18 | MyType2& operator=(MyType2 const&) { throw 4; } | ^ The former can be fixed by removing the space between the identifier and the double quotes, the latter by declaring the functions with [[noreturn]]. PR: 293446 Approved by: maintainer timeout (2 weeks) MFH: 2026Q1 (cherry picked from commit a080335cdc0d1c38ab913096650e4b0cbcd9454e) --- .../files/patch-include_internal_catch__approx.cpp | 15 +++++++++++++++ .../catch/files/patch-include_internal_catch__approx.h | 13 +++++++++++++ .../files/patch-include_internal_catch__stringref.h | 17 +++++++++++++++++ ...rojects_SelfTest_IntrospectiveTests_String.tests.cpp | 11 +++++++++++ ...ojects_SelfTest_UsageTests_ToStringVariant.tests.cpp | 17 +++++++++++++++++ 5 files changed, 73 insertions(+) diff --git a/devel/catch/files/patch-include_internal_catch__approx.cpp b/devel/catch/files/patch-include_internal_catch__approx.cpp new file mode 100644 index 000000000000..a552a75312a2 --- /dev/null +++ b/devel/catch/files/patch-include_internal_catch__approx.cpp @@ -0,0 +1,15 @@ +--- include/internal/catch_approx.cpp.orig 2022-10-16 09:02:17 UTC ++++ include/internal/catch_approx.cpp +@@ -73,10 +73,10 @@ namespace literals { + } // end namespace Detail + + namespace literals { +- Detail::Approx operator "" _a(long double val) { ++ Detail::Approx operator ""_a(long double val) { + return Detail::Approx(val); + } +- Detail::Approx operator "" _a(unsigned long long val) { ++ Detail::Approx operator ""_a(unsigned long long val) { + return Detail::Approx(val); + } + } // end namespace literals diff --git a/devel/catch/files/patch-include_internal_catch__approx.h b/devel/catch/files/patch-include_internal_catch__approx.h new file mode 100644 index 000000000000..4ac587fd402d --- /dev/null +++ b/devel/catch/files/patch-include_internal_catch__approx.h @@ -0,0 +1,13 @@ +--- include/internal/catch_approx.h.orig 2022-10-16 09:02:17 UTC ++++ include/internal/catch_approx.h +@@ -118,8 +118,8 @@ namespace literals { + } // end namespace Detail + + namespace literals { +- Detail::Approx operator "" _a(long double val); +- Detail::Approx operator "" _a(unsigned long long val); ++ Detail::Approx operator ""_a(long double val); ++ Detail::Approx operator ""_a(unsigned long long val); + } // end namespace literals + + template<> diff --git a/devel/catch/files/patch-include_internal_catch__stringref.h b/devel/catch/files/patch-include_internal_catch__stringref.h new file mode 100644 index 000000000000..cf80b6057a02 --- /dev/null +++ b/devel/catch/files/patch-include_internal_catch__stringref.h @@ -0,0 +1,17 @@ +--- include/internal/catch_stringref.h.orig 2022-10-16 09:02:17 UTC ++++ include/internal/catch_stringref.h +@@ -92,12 +92,12 @@ namespace Catch { + auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; + + +- constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { ++ constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { + return StringRef( rawChars, size ); + } + } // namespace Catch + +-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { ++constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { + return Catch::StringRef( rawChars, size ); + } + diff --git a/devel/catch/files/patch-projects_SelfTest_IntrospectiveTests_String.tests.cpp b/devel/catch/files/patch-projects_SelfTest_IntrospectiveTests_String.tests.cpp new file mode 100644 index 000000000000..34e1af72ce42 --- /dev/null +++ b/devel/catch/files/patch-projects_SelfTest_IntrospectiveTests_String.tests.cpp @@ -0,0 +1,11 @@ +--- projects/SelfTest/IntrospectiveTests/String.tests.cpp.orig 2022-10-16 09:02:17 UTC ++++ projects/SelfTest/IntrospectiveTests/String.tests.cpp +@@ -141,7 +141,7 @@ TEST_CASE("StringRef at compilation time", "[Strings][ + STATIC_REQUIRE(sr1.size() == 3); + STATIC_REQUIRE(sr1.isNullTerminated()); + +- using Catch::operator"" _sr; ++ using Catch::operator""_sr; + constexpr auto sr2 = ""_sr; + STATIC_REQUIRE(sr2.empty()); + STATIC_REQUIRE(sr2.size() == 0); diff --git a/devel/catch/files/patch-projects_SelfTest_UsageTests_ToStringVariant.tests.cpp b/devel/catch/files/patch-projects_SelfTest_UsageTests_ToStringVariant.tests.cpp new file mode 100644 index 000000000000..7da71b26f779 --- /dev/null +++ b/devel/catch/files/patch-projects_SelfTest_UsageTests_ToStringVariant.tests.cpp @@ -0,0 +1,17 @@ +--- projects/SelfTest/UsageTests/ToStringVariant.tests.cpp.orig 2022-10-16 09:02:17 UTC ++++ projects/SelfTest/UsageTests/ToStringVariant.tests.cpp +@@ -10,12 +10,12 @@ struct MyType1 { + struct MyType1 { + MyType1() = default; + [[noreturn]] MyType1(MyType1 const&) { throw 1; } +- MyType1& operator=(MyType1 const&) { throw 3; } ++ [[noreturn]] MyType1& operator=(MyType1 const&) { throw 3; } + }; + struct MyType2 { + MyType2() = default; + [[noreturn]] MyType2(MyType2 const&) { throw 2; } +- MyType2& operator=(MyType2 const&) { throw 4; } ++ [[noreturn]] MyType2& operator=(MyType2 const&) { throw 4; } + }; + + TEST_CASE( "variant", "[toString][variant][approvals]")