From nobody Fri Aug 16 15:44:49 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 4WlmX20BSfz5T7mQ; Fri, 16 Aug 2024 15:44:50 +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 4WlmX12G02z4fGj; Fri, 16 Aug 2024 15:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823089; 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=X1j59a7fPYHk41eb9DjlOyoAh9Ky7NAWwA5UMyVxDuA=; b=eosl7/khlApgEzsVFj3f70XHBOyOtIu771fTbVEUXHtyIm/RQetyZ0bfUc2IONFyZ066Hl LqrtBeuK9TMVWjxL5PseAs0ywdLtrFkITtS9IZ99iYi6t3d7VLJ0RU/nr9SErbq0BI/IlY Q+tfSYohOpr2S4Dzu8mj7V7hhxYcqk7WgLABC+wYTuo9D2nH9pOwbqoJ/w9MJ2kMuRiEgi GsmglILSZ+7rpaF/5oNSMPyXassCz4tbX8949FO0begsz/EXNnrBj5lONXXyQ30Bj5f0Z5 3Mn/Mw1mFJQ8IdVwAyCuTfFJ1Mm6c3wRDFQfLx/Rhpe8i9p4CCJg8zoK3p3/HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723823089; a=rsa-sha256; cv=none; b=qXBOaeXOU8V6ipijuWvVUlISe58xN8wuH0Ou/U+7tuoxWnOR4kONC6CR+BEvOzns70HerA xW3Iz83kgAchkg4/AyPPbqTFtMC7hRvCCbH4KHJop9oBTSjrso60CQBST7+60ksMXqOS+2 EQ+azKI8U9u++mB3mYXdzljdcYM/rSpcm7SEyH5kjulQkix+NJVV7D0Iu1gkfTCQB6ByBF G/o83Ppov9HpREf2dxqLIFRgAm4IlhnK1o8YfsnGi1LLW6vBEODu0fDfXiwtKbpk9LByv7 KVT+SE3BrMeRiGe/6EdjhUkrFvFrUvQCqIGz8VxCznt2uHTYXt7Bzt1W65jWCQ== 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=1723823089; 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=X1j59a7fPYHk41eb9DjlOyoAh9Ky7NAWwA5UMyVxDuA=; b=iUkrQofyKdWMPa+pBS4Zdx7rmQplfvT73X3q+qF2j7PNRyqak1rcGkYIsMh79x9yKQK4Q9 DoX+fnOXIRAai2mCakmvMO831DYObsHCEJMHEkQBdr2b7PMfRTcf7hxhellE3dZC35YRK7 OyEoshxRiv++LU5p4A0frucaPVc5x/NGFGMZmQlPtH19107Ct1jvEiVtl8iXHcHhq37Sfg KYf5uWdqY7c9B8eZdI4voLhZd62z7uYm74fQYtORe7qeyNdEvnNvVj/43WIMNX+IVHYO6s ZpvSZc1AE5kjeVg9OqVkI+YCFumNgMcJFtUdnzUeMmbeEX5Az66aejNdxQFr4g== 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 4WlmX11rHhz1B88; Fri, 16 Aug 2024 15:44:49 +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 47GFin26096015; Fri, 16 Aug 2024 15:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFinD4096012; Fri, 16 Aug 2024 15:44:49 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:44:49 GMT Message-Id: <202408161544.47GFinD4096012@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: 459baf8a44da - 2024Q3 - textproc/zxing-cpp: 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: 459baf8a44da4f346e7e9a2160f82fe4ccf6631e Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=459baf8a44da4f346e7e9a2160f82fe4ccf6631e commit 459baf8a44da4f346e7e9a2160f82fe4ccf6631e Author: Dimitry Andric AuthorDate: 2024-08-13 10:01:40 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:44:18 +0000 textproc/zxing-cpp: 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 textproc/zxing-cpp to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string_view:300:42: error: implicit instantiation of undefined template 'std::char_traits' 300 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/textproc/zxing-cpp/work/zxing-cpp-2.2.1/core/src/Utf.cpp:72:42: note: in instantiation of template class 'std::basic_string_view' requested here 72 | static size_t Utf8CountCodePoints(utf8_t utf8) | ^ /usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here 45 | struct char_traits; | ^ `utf8_t` is effectively defined as `std::basic_string`, which is no longer possible. So redefine it as a `std::vector` instead. This requires only a small adjustment in one other place: replacing the initializer list in the `AppendFromUtf8` call in `FromUtf8`. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 280791 Approved by: tcberner (maintainer) MFH: 2024Q3 (cherry picked from commit 43d0c7131e80e98445045b1d17a6054db1c6369d) --- textproc/zxing-cpp/files/patch-core_src_Utf.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/textproc/zxing-cpp/files/patch-core_src_Utf.cpp b/textproc/zxing-cpp/files/patch-core_src_Utf.cpp new file mode 100644 index 000000000000..cf8e04839b92 --- /dev/null +++ b/textproc/zxing-cpp/files/patch-core_src_Utf.cpp @@ -0,0 +1,21 @@ +--- core/src/Utf.cpp.orig 2023-12-10 23:43:27 UTC ++++ core/src/Utf.cpp +@@ -20,7 +20,7 @@ using char8_t = uint8_t; + #if __cplusplus <= 201703L + using char8_t = uint8_t; + #endif +-using utf8_t = std::basic_string_view; ++using utf8_t = std::vector; + + using state_t = uint8_t; + constexpr state_t kAccepted = 0; +@@ -118,7 +118,8 @@ std::wstring FromUtf8(std::string_view utf8) + std::wstring FromUtf8(std::string_view utf8) + { + std::wstring str; +- AppendFromUtf8({reinterpret_cast(utf8.data()), utf8.size()}, str); ++ const char8_t* data = reinterpret_cast(utf8.data()); ++ AppendFromUtf8({data, data + utf8.size()}, str); + return str; + } +