From nobody Fri Mar 13 08:33:38 2026 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 4fXHnZ1xgdz6VhsW for ; Fri, 13 Mar 2026 08:33:38 +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 4fXHnZ13YRz3xry for ; Fri, 13 Mar 2026 08:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773390818; 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=aXur+b6QZBdJbmQIjD8TxQmkHV7M79EfEjypx3I2uNk=; b=PjRMCQF3Z6E1SAlkzeYRth3O9GXDjzIsZLnpu7NXOo3UZjfwk1Pd9IDadT4NZJMgBV5vWO IXdNYwo9x8JIB1FSGXacm4au5pMZkKSlQyPndQWP1ZpZcevsdQrNFh7OMv+/2lNSLK9bNX tQYVoGRnhjxrnWkZAIkKgBew1B4aDGSphBT2bL4L/PyTJjxAP0sEPaquhA4aXwNkYJNlpT Zd55dENXeR/KUKyqVxNWCr1RhZr7rHqsPn94JnHeFmkv0Xq7QaKX9gMZaWPVNAG2DMYzwE AXsX5sgIq/Bc2xszMcSvLdgy9t8YEYa3I7kIsELH0B5/XtoOGnIVmnrir+NhzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773390818; a=rsa-sha256; cv=none; b=XR1JoxRSeUbdzdw6K27pJQ5xDoP8PA6tn657CbCL14AiI4qvTiMERvR0YfoKkoPF1iG757 FU2oG2E7IkC9UGywoZKiCsy6wFojOMrfr3tdq3Qw3tgALHMgezYXUHWMJRHEgU4psnfkkZ fhkQ5zuKPOzj5pkz8WSC/L23tajdPlwj2FQhQHAQU7ACZG30IsiTAWSh1mbMy2LwxGjViB kocwnt1++IfY+FiKI7ZujY1tK+0kr0o64Rxgo5J7Z/56e1BSaNTreN+YZNZ5lKL801l/Lu Lo8s9ptH19+0mNLeJaJaMeZGhzDPOhikrfgikPWKeaH+WMVrVOcu/VlGJnN3qA== 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=1773390818; 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=aXur+b6QZBdJbmQIjD8TxQmkHV7M79EfEjypx3I2uNk=; b=irDQef9gEeReAEhpDH4jsLI+9qDFt4QOCKscIJBhTN/8S8U2JnazGmL0ZekEUv8z1Wea+h LNKCUiPNjEXNM/txaA2xsXUE6y7i8IQBm+WH8ouxE2IVnywvg3Np78hnD3WZr9eAha7xHn iq5PpgpJ875WpUr2T2L1jgfkXzaT8UfZlwzD0Opf9Ku0DMJdedVbdcNEaMaUR8ymKFbrnM E4qnQR6xHdH3V2785LRcUj353QVE26aMLDpdR6W+49aWznHf/rme7fgEq2cjWRdnAOYJcI MYrM5xml8BexiZ/+iguDcFbOd0j0sbe+vei1Pj6yebCkA2+m8tNlECQpseAJ2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXHnZ0RxFz8cQ for ; Fri, 13 Mar 2026 08:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 08:33:38 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: a080335cdc0d - main - devel/catch: fix build with clang 21 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a080335cdc0d1c38ab913096650e4b0cbcd9454e Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 08:33:38 +0000 Message-Id: <69b3cbe2.39b5b.558d2f2b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=a080335cdc0d1c38ab913096650e4b0cbcd9454e commit a080335cdc0d1c38ab913096650e4b0cbcd9454e Author: Dimitry Andric AuthorDate: 2026-02-25 19:21:07 +0000 Commit: Dimitry Andric CommitDate: 2026-03-13 08:33:17 +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 --- .../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]")