From nobody Wed Oct 30 18:05:04 2024 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 4Xdw5F1QSLz5bmnq; Wed, 30 Oct 2024 18:05:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdw5F0V3tz4MHw; Wed, 30 Oct 2024 18:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730311505; 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=1XW8mk7MapY0evzTuV1/hmJckNHoKaikxJblXFot4Yo=; b=ZTA27VENVbFx6JfJSXrR++OzD54iCM5PkhmxK8VisByUqZd0+fDQ1lyemg+9lg3cpQSF4d DnHJCDe59N7m8Wc/HHU4FpFlU5zBKJ+NvzgG2AxgCfJcpRtZxJ1f7K2hoZiPRfYBRjj+VN 6UAQXq3uLHCsPcV9LWjqq+u60wE7Kxmi+aU4m0SeHDuWsAAXtKshFsuQCxaFQvUxpYIYqB N/80/RTT737FnphII6CKDLGjaEB+sJeoLXUfEgqx8dgOMLUYN+Cap6Jg1/c+VBzXbWCJBe iLQucAQpjQNppMiLbmaGq6na4U0xxBeB3vi54YnnzbwyAlk/9EWfRO67uuUEtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730311505; 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=1XW8mk7MapY0evzTuV1/hmJckNHoKaikxJblXFot4Yo=; b=LxXx3wSJjBmXH157LgnvkqjJFuai9HKPUXdu5Lih8/RrzRZFuPdyef3oX7fvDGlVUvJKaD PMPJhqUD1aN4E4pcKTF1vKyxEtnRT6ZTnxi/tF4Lp9mkBjn8LDDPmlS4XeLggvzQ1D5xfB p3wezZmAe3OY5G7xzTi3UQu+68g/Yuc46Co6oRPtHQfIjqYJgbVdrDfwfktJlkj5JMj5wv QcMgcpvyLqy2iKJF8i66OIt1l0l3cuK2VAkj0AxQ2lIWcNqEcB9sn9TpgJs8uohfkV6BbT /cTNiW7KK3nktenHz7uQERDcwpaCmp1nI6zfgDz03QO7bHYx5r85YpwWRBkXLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730311505; a=rsa-sha256; cv=none; b=pGqVjLl64Vw+jQQ+qB+PKYHqjf4YCiLfFCRXTke6cGtGBG7ZXy+XtsAcsN7b60iZH27b7q yKDhSNgBOcJI1nqZzn1ts9LITP1DaBcyPZEydHzczOPXq3xt6Cwr1tFbZRftGXj3eP/nOL zFyBj4LdXKfT5WKhEZ6/fwxEgktqQ82uOINSdvEWlvsfKM9fdwHEq1TX5g0DRSlmHwQnl6 8HUdJaE+W2thBlGtbRj4X80x47NUrN1zz8ypnzEbjTKem0KmSmPD1DFovvssfgfXn6jafT WxwFCkJzwZRNBzf+bHZlFxGZNmUu6f5d257cc8dPPXkQZCYht7gvZb4g8Qj6yA== 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 4Xdw5F05Pqz1HjM; Wed, 30 Oct 2024 18:05:05 +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 49UI54Jm016272; Wed, 30 Oct 2024 18:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UI54rC016269; Wed, 30 Oct 2024 18:05:04 GMT (envelope-from git) Date: Wed, 30 Oct 2024 18:05:04 GMT Message-Id: <202410301805.49UI54rC016269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fbe59a5cf195 - main - games/punchy: unbreak build with libc++ 19 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbe59a5cf195f160098f71ca1228a805b0ade931 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbe59a5cf195f160098f71ca1228a805b0ade931 commit fbe59a5cf195f160098f71ca1228a805b0ade931 Author: Jan Beich AuthorDate: 2024-10-28 10:56:14 +0000 Commit: Jan Beich CommitDate: 2024-10-30 18:03:40 +0000 games/punchy: unbreak build with libc++ 19 In file included from ../../../punchy-0.3.0/cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.cc:5: In file included from ../../../punchy-0.3.0/cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.h:8: /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, | ^ ../../../punchy-0.3.0/cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.cc:387:26: note: in instantiation of template class 'std::basic_string' requested here 387 | std::basic_string UTF8ToUTF16(const char* stringStart, size_t length) { | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Reported by: pkg-fallout Obtained from: 2d0cb380eb97 --- games/punchy/files/patch-libc++19 | 144 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/games/punchy/files/patch-libc++19 b/games/punchy/files/patch-libc++19 new file mode 100644 index 000000000000..4d4db75d215a --- /dev/null +++ b/games/punchy/files/patch-libc++19 @@ -0,0 +1,144 @@ +https://chromium.googlesource.com/v8/v8/+/182d9c05e78b%5E%21/ + +--- cargo-crates/v8-0.47.1/v8/src/inspector/string-16.cc.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/inspector/string-16.cc +@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { + return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); + } + +-int64_t charactersToInteger(const UChar* characters, size_t length, ++int64_t charactersToInteger(const uint16_t* characters, size_t length, + bool* ok = nullptr) { + std::vector buffer; + buffer.reserve(length + 1); +@@ -50,6 +50,8 @@ String16::String16(const UChar* characters, size_t siz + + String16::String16(const UChar* characters, size_t size) + : m_impl(characters, size) {} ++String16::String16(const uint16_t* characters, size_t size) ++ : m_impl(reinterpret_cast(characters), size) {} + + String16::String16(const UChar* characters) : m_impl(characters) {} + +@@ -231,6 +233,10 @@ String16 String16::fromUTF16LE(const UChar* stringStar + // No need to do anything on little endian machines. + return String16(stringStart, length); + #endif // V8_TARGET_BIG_ENDIAN ++} ++ ++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { ++ return fromUTF16LE(reinterpret_cast(stringStart), length); + } + + std::string String16::utf8() const { +--- cargo-crates/v8-0.47.1/v8/src/inspector/string-16.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/inspector/string-16.h +@@ -6,6 +6,7 @@ + #define V8_INSPECTOR_STRING_16_H_ + + #include ++#include + + #include + #include +@@ -17,7 +18,7 @@ namespace v8_inspector { + + namespace v8_inspector { + +-using UChar = uint16_t; ++using UChar = char16_t; + + class String16 { + public: +@@ -27,6 +28,7 @@ class String16 { + String16(const String16&) V8_NOEXCEPT = default; + String16(String16&&) V8_NOEXCEPT = default; + String16(const UChar* characters, size_t size); ++ String16(const uint16_t* characters, size_t size); + V8_EXPORT String16(const UChar* characters); + V8_EXPORT String16(const char* characters); + String16(const char* characters, size_t size); +@@ -47,7 +49,9 @@ class String16 { + uint64_t toUInt64(bool* ok = nullptr) const; + int toInteger(bool* ok = nullptr) const; + String16 stripWhiteSpace() const; +- const UChar* characters16() const { return m_impl.c_str(); } ++ const uint16_t* characters16() const { ++ return reinterpret_cast(m_impl.c_str()); ++ } + size_t length() const { return m_impl.length(); } + bool isEmpty() const { return !m_impl.length(); } + UChar operator[](size_t index) const { return m_impl[index]; } +@@ -76,6 +80,8 @@ class String16 { + // Instantiates a String16 in native endianness from UTF16 LE. + // On Big endian architectures, byte order needs to be flipped. + V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart, ++ size_t length); ++ V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart, + size_t length); + + std::size_t hash() const { +--- cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.cc.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.cc +@@ -12,7 +12,7 @@ namespace { + + namespace v8_inspector { + namespace { +-using UChar = uint16_t; ++using UChar = char16_t; + using UChar32 = uint32_t; + + bool isASCII(UChar c) { return !(c & ~0x7F); } +@@ -386,7 +386,7 @@ std::basic_string UTF8ToUTF16(const char* strin + + std::basic_string UTF8ToUTF16(const char* stringStart, size_t length) { + if (!stringStart || !length) return std::basic_string(); +- std::vector buffer(length); ++ std::vector buffer(length); + UChar* bufferStart = buffer.data(); + + UChar* bufferCurrent = bufferStart; +@@ -395,7 +395,7 @@ std::basic_string UTF8ToUTF16(const char* strin + reinterpret_cast(stringStart + length), + &bufferCurrent, bufferCurrent + buffer.size(), nullptr, + true) != conversionOK) +- return std::basic_string(); ++ return std::basic_string(); + size_t utf16Length = bufferCurrent - bufferStart; + return std::basic_string(bufferStart, bufferStart + utf16Length); + } +--- cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/inspector/v8-string-conversions.h +@@ -10,8 +10,8 @@ namespace v8_inspector { + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may + // want to use string-16.h directly rather than these. + namespace v8_inspector { +-std::basic_string UTF8ToUTF16(const char* stringStart, size_t length); +-std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length); ++std::basic_string UTF8ToUTF16(const char* stringStart, size_t length); ++std::string UTF16ToUTF8(const char16_t* stringStart, size_t length); + } // namespace v8_inspector + + #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ +--- cargo-crates/v8-0.47.1/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc +@@ -11,13 +11,16 @@ std::string UTF16ToUTF8(span in) { + namespace v8_crdtp { + + std::string UTF16ToUTF8(span in) { +- return v8_inspector::UTF16ToUTF8(in.data(), in.size()); ++ return v8_inspector::UTF16ToUTF8(reinterpret_cast(in.data()), ++ in.size()); + } + + std::vector UTF8ToUTF16(span in) { +- std::basic_string utf16 = v8_inspector::UTF8ToUTF16( ++ std::basic_string utf16 = v8_inspector::UTF8ToUTF16( + reinterpret_cast(in.data()), in.size()); +- return std::vector(utf16.begin(), utf16.end()); ++ return std::vector( ++ reinterpret_cast(utf16.data()), ++ reinterpret_cast(utf16.data()) + utf16.size()); + } + + } // namespace v8_crdtp