From nobody Sat Oct 26 11:07:43 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 4XbH1X11Fdz5ZcjL; Sat, 26 Oct 2024 11:07:44 +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 4XbH1X0777z42Dd; Sat, 26 Oct 2024 11:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729940864; 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=Q6rwfH23uTRWPY5duQwCC86qXVmwX2R/bjJgYcoV0n4=; b=xptfwF/4MTfZPinN2HbMXOaVJPV1nxzeENuL7kalPGjRJcQxkeJSa8czEdHSF/nZSil6rQ HbaIMRyOj0CBj9Un8R8Ry0rvw/e2qcD6g0KiSEY/uGmHKVsU1JmhRWI11wIaXTriKFH8o7 igGnl5latQ3YxtuduPwuXkmXcNtUwc/zsBjEgEzSQCd7oNNAgHcetI872isMlu77QPri2Z LG1i3hd7AqP3tWM5JF++Tlm0Rk/+xC6GaV1FIQtqroP5jfjymhsnzuNRjRaKi5+R5LByhA cZ1ESO2sh+vwQWF7KRVimP+TQWGyGxv7OXlyBUOW2tbQwAyvYgyzo2IeAh5Jeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729940864; 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=Q6rwfH23uTRWPY5duQwCC86qXVmwX2R/bjJgYcoV0n4=; b=fK8/b91hLU/lfaHVFuv6j3wOctpoz9YDI0fUIrTs6Ry4bJTtt+JJQYs4JlRYobBQMQ2/e8 i0aMn1x6z865UyZwJouqUtpdCG0U3AuOG7Q8wk4v6+yDTxIk0GJuerA4iIBXYkAcRW0PYV o64tR7CWSZNWCqBEXrSsTIbDX67JR0jTjHvcME4zP64VTuhZ4z5z6eaJB/F/RndsVL+aIu 4XxP0IAqXHl4uOdwsTCx3IeMoQ3UM3nIWmeEIsmhuPYfP8x0AUG+6gvgkdbwNK8hQlyee8 I++n1t9Qw8pEHw+RxxdguWdYDlEsCfxCWu9JwY0FPy76C1lW3VafWbivp3ODUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729940864; a=rsa-sha256; cv=none; b=b8+gyLS8hH4f1snbvgGw9cKFPAJLW2VtaRdiWVbyDmoMsNe4PQvWy+A4iHn1KqOK8gMJsU KhQoc7mx+Uib83/Ce+Ni9Q6yxJcSmxE4a/a7rwn3l6ronS/9EE+kmj5DLwb3ekDfSBDHZr LwIZ8M2tGMAUud0nEUYl0vEF8Az6jOWPQYReVd9hMwCbc4uYrWcTkrofULHr268sgSxOrm ZAZE94O4W/H8oDO70goVFZqL+xSG+WI4axXqU//ahN0e5hzwj2SU2MEztG0RYSB+lox5Gu 2XNLCCg5aHpX/D5qCm88/hBjW67KHaYyv5/y1AOt59jFWW5g9l9Zxv8+p6IpKA== 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 4XbH1W6rMjz173w; Sat, 26 Oct 2024 11:07:43 +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 49QB7hNK058308; Sat, 26 Oct 2024 11:07:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QB7hNv058305; Sat, 26 Oct 2024 11:07:43 GMT (envelope-from git) Date: Sat, 26 Oct 2024 11:07:43 GMT Message-Id: <202410261107.49QB7hNv058305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 2e294149c668 - main - x11-toolkits/mygui: fix 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e294149c6682f1a8cb384d0e36a14b12b9c3e35 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e294149c6682f1a8cb384d0e36a14b12b9c3e35 commit 2e294149c6682f1a8cb384d0e36a14b12b9c3e35 Author: Dimitry Andric AuthorDate: 2024-10-08 09:08:59 +0000 Commit: Dimitry Andric CommitDate: 2024-10-26 11:06:23 +0000 x11-toolkits/mygui: 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 x11-toolkits/mygui to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: In file included from /wrkdirs/usr/ports/x11-toolkits/mygui/work/mygui-MyGUI3.4.2/MyGUIEngine/include/MyGUI_Common.h:12: /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, y | ^ /wrkdirs/usr/ports/x11-toolkits/mygui/work/mygui-MyGUI3.4.2/MyGUIEngine/include/MyGUI_UString.h:213:4: note: in instantiation of template class 'std::basic_string' requested here 213 | dstring::iterator mIter; | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ These can be fixed by using `char16_t` instead of `uint16_t` for the `code_point` type, and `char32_t` instead of `uint32_t` for the `unicode_char` type. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281974 Approved by: maintainer timeout (2 weeks) MFH: 2024Q4 --- .../files/patch-MyGUIEngine_include_MyGUI__UString.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/x11-toolkits/mygui/files/patch-MyGUIEngine_include_MyGUI__UString.h b/x11-toolkits/mygui/files/patch-MyGUIEngine_include_MyGUI__UString.h new file mode 100644 index 000000000000..cb5275188b1f --- /dev/null +++ b/x11-toolkits/mygui/files/patch-MyGUIEngine_include_MyGUI__UString.h @@ -0,0 +1,15 @@ +--- MyGUIEngine/include/MyGUI_UString.h.orig 2023-05-09 09:46:12 UTC ++++ MyGUIEngine/include/MyGUI_UString.h +@@ -164,10 +164,10 @@ namespace MyGUI + static const size_type npos = static_cast(~0); + + //! a single 32-bit Unicode character +- using unicode_char = uint32; ++ using unicode_char = char32_t; + + //! a single UTF-16 code point +- using code_point = uint16; ++ using code_point = char16_t; + + //! value type typedef for use in iterators + using value_type = code_point;