From nobody Sat Sep 28 13:41:41 2024 X-Original-To: dev-commits-ports-branches@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 4XG7m547wPz5XMbX; Sat, 28 Sep 2024 13:41:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG7m53fHZz4Vph; Sat, 28 Sep 2024 13:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727530901; 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=nl/ea4bji/0M2ebN88XoX9wjfZKaYex6s7VhQe5K9LA=; b=XppWWYp1GGjt7aZqDnGcrG3Rsp0vozyK01XcGI9lPSsZY+pNGCqkB2QJtT9y7QSuD0GDY9 kR273owWK9xhhFoCoSd9ZeOGZZE7Qok4Vezxteb/xqoQmGPOukvF2pvQlImD8yb5KQ9ZBY ZexFYtSUzhCfW7WAaZeH2AaABsz5RkSUSN8zqW2QkeXoKI4MzZV2zk5TnHmp6EHf0Casgz a53Vf+ndsbU7OG/Hy8otm06dRLOrNa6LLBQEXjB72A4ocef9vWzBygoQ4z3ZSgHB/Ow2Jz sjuoGDxNc52hV9Z1QEVPU9WoNovPBiSiLSr/jUxSb6Mz4SZkqJIXDDNwMyC7Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727530901; 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=nl/ea4bji/0M2ebN88XoX9wjfZKaYex6s7VhQe5K9LA=; b=lWZ0pV2W6P0R4tq1y871vp11kkHvmwdje2AHhIwpa2aIy/XlOdjtIst4CV72+815D4tKHD mHpyj8a5DM9fd1PGaWJ7sJmSdL4x0+aqDk3g+bzIW5Sf+VOgewDuIe97WBlCLOBQdB7LhE 34TNxinmC2C9t4y8PruW+jfK06ogW+fXRByJpDEmAkwNp80nfO+ZIxPGgkUiSXyoKQUFBs QL7yHegsdMg1tzuRVd7YAxTycbt57MrO9L5ydwvAMoyoP1KlWaqdZ2S8/zyViWSTaKVUku LofoYTWMUpZMI7Wc2eIKQkAk0za12swmb0i3J0AHB0YB5TVKwulPmSWX+BwrPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727530901; a=rsa-sha256; cv=none; b=s9blPo8cS7P66D5wbNrayXetluPBZcUPqytYc/EsZEd3/Dy+Bz7pq7wkrZ2vxgszIY/ll2 k6InPbJzjB1BIEx3sBxGDCCz89snxt6ej6XNHsjm+ORbmRMATqHW4b933jMqg5Ay63S6V5 dgUV1ks4lFwkAEyPWCK3zwqcteAExpZuENIeSCZo44tHfb8nqbxIFNnBjYqFjwWpOyKDDd j4XUrYYGdKtsAqbbBUXEzW9vquHTjj3HTYrVDHnM0homJaPcG9NSrXG0JlGa1P8EiLYfGO XL2w3G8Fjgz1OE21Zw1mQO9A0NPcRpZTaQJVCvVx7M9txI8qKXO/A2daMRDRAg== 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 4XG7m53FVGzQtn; Sat, 28 Sep 2024 13:41:41 +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 48SDffAh016744; Sat, 28 Sep 2024 13:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SDfffg016741; Sat, 28 Sep 2024 13:41:41 GMT (envelope-from git) Date: Sat, 28 Sep 2024 13:41:41 GMT Message-Id: <202409281341.48SDfffg016741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 646153bbb019 - 2024Q3 - devel/poco: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 646153bbb0191367b737a03702d1baa3a0c5bfe3 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=646153bbb0191367b737a03702d1baa3a0c5bfe3 commit 646153bbb0191367b737a03702d1baa3a0c5bfe3 Author: Dimitry Andric AuthorDate: 2024-09-17 08:21:22 +0000 Commit: Dimitry Andric CommitDate: 2024-09-28 13:38:31 +0000 devel/poco: fix build with libc++ 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes devel/poco to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /usr/include/c++/v1/__type_traits/is_constructible.h:42:62: note: in instantiation of template class 'std::basic_string' requested here 42 | : public integral_constant)> {}; | ^ /usr/include/c++/v1/__type_traits/is_swappable.h:43:39: note: in instantiation of template class 'std::is_move_constructible>' requested here 43 | using __swap_result_t = __enable_if_t::value && is_move_assignable<_Tp>::value>; | ^ /usr/include/c++/v1/__type_traits/is_swappable.h:50:60: note: in instantiation of template type alias '__swap_result_t' requested here 50 | inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __swap_result_t<_Tp> swap(_Tp& __x, _Tp& __y) | ^ /wrkdirs/usr/ports/devel/poco/work/poco-1.12.4-all/Data/include/Poco/Data/LOB.h:243:14: note: while substituting explicitly-specified template arguments into function template 'swap' 243 | inline void swap(Poco::Data::BLOB& b1, Poco::Data::BLOB& b2) noexcept | ^ In this case it is enough to only enable the LOB constructor from std::basic_string when the type is plain char. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281553 MFH: 2024Q3 (cherry picked from commit c55157301f317ab8166349340d4cc0765deaac12) --- devel/poco/files/patch-Data_include_Poco_Data_LOB.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/devel/poco/files/patch-Data_include_Poco_Data_LOB.h b/devel/poco/files/patch-Data_include_Poco_Data_LOB.h new file mode 100644 index 000000000000..e893a18625b2 --- /dev/null +++ b/devel/poco/files/patch-Data_include_Poco_Data_LOB.h @@ -0,0 +1,14 @@ +--- Data/include/Poco/Data/LOB.h.orig 2022-10-31 17:44:34 UTC ++++ Data/include/Poco/Data/LOB.h +@@ -63,8 +63,9 @@ class LOB (public) + { + } + +- LOB(const std::basic_string& content): +- _pContent(new std::vector(content.begin(), content.end())) ++ template ::value>> ++ LOB(const std::basic_string& content): ++ _pContent(new std::vector(content.begin(), content.end())) + /// Creates a LOB from a string. + { + }