From nobody Sat Oct 26 11:08:14 2024 X-Original-To: dev-commits-ports-all@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 4XbH263Tncz5ZcjT; Sat, 26 Oct 2024 11:08:14 +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 4XbH262dyPz423m; Sat, 26 Oct 2024 11:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729940894; 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=iL8Mk6nd45YhfoY2AKa9XPuH+0o+xNytUqKVqBgqlvw=; b=OtuP48k8oqtr+Rs9Q45X7jc+QNQzIYNCX+/vM1IJpY/fTZXEtjo9kXTashY2dOlcMOwsDz 7rPLf3B++4E2ZgB/mscDyhwwy7QRtsg21QcUAHysuTeVR+VqseVBJLZ4z39mf4xOzKo2SC 8c/j/dBc7XNbVhFWJQ9RwnVIDYRO8NVOX59eEbhweBUeL7DIbXPj17g1UR3wOfkdADQ6Fm SWrWM2p1YvOeUunvqJ58FUOpIE6WciZU/izoqG+pDOP5H+zOb3jekwMc8kbl/jIQ8+fBkP EGNL0BqO2h3omhLsQKhpJf+8PkM9r+iDAri4tXXjaQao7ErNbBVYhD1MOLnHbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729940894; 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=iL8Mk6nd45YhfoY2AKa9XPuH+0o+xNytUqKVqBgqlvw=; b=BtyMA7FH1B4I5UOJJUreYcl2slnBK1e/bIONCOzb7LhJ1FM6WsoGC4+J2N4vtp2LQZdBrr 5yDfIB28mOKH2Rmw9q+6zKNC8VKHV2Mkj+eTYvbJhMo1ZgnRw6sWBua/50yQE7a9WO+bzH 04mdL1fcn4BUyH3C5Mg2d+Kkg4xZSZNDJ89RLmrjPU7XrlswBLa3XG86x70RQbtx67+x3I B5Xk8Fi4b8FVFmKspWtiYmOB8YN2Jbhx0jz0NI+xp+fWxIJY0BTUWqLwqXZEukeu5yFwD6 L0VVvRaXNK24qiq/eMwWcCs4sgmfhtW90/0UokPJLMhoBko16Erex59qANRdhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729940894; a=rsa-sha256; cv=none; b=XCXAc9mMKcQMAdCPtn8JpEFJs/gc9vII4dm/fqsYbW+ZwO2uaW4jE3ceZMo03eVoyCWxpG L0E9ZEpiZlcu2pK7C/N3vP49M+21kfnH9GoOLQnQDKTl0RS9cvpsroru4bUlQS7oj8lOxI Fbqkrf06gfBu9SaQik4a2wav2NdrakEANSNNGMAIFjm7ZVDrpdckJMvUsuOtfGhmgo2l9v cGuzxfDfKs0dKufWjgos8AUv0iiCG5qF03jzzdQ6DyBAhfLMNZhfNetwBl9O5z42HJwNXM 6uHUnzKxxTbQNCcbnQ8mJ2VK/U7fNYO/tBm/XzvCHzErAiWxJa+flIZ+0Z3rKA== 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 4XbH262FqCz168v; Sat, 26 Oct 2024 11:08:14 +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 49QB8Ejf058579; Sat, 26 Oct 2024 11:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QB8EqU058576; Sat, 26 Oct 2024 11:08:14 GMT (envelope-from git) Date: Sat, 26 Oct 2024 11:08:14 GMT Message-Id: <202410261108.49QB8EqU058576@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: 7337e5d55caf - 2024Q4 - x11-toolkits/mygui: fix build with libc++ 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 7337e5d55caf016095c2523bc26892666cc373c0 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7337e5d55caf016095c2523bc26892666cc373c0 commit 7337e5d55caf016095c2523bc26892666cc373c0 Author: Dimitry Andric AuthorDate: 2024-10-08 09:08:59 +0000 Commit: Dimitry Andric CommitDate: 2024-10-26 11:08:03 +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 (cherry picked from commit 2e294149c6682f1a8cb384d0e36a14b12b9c3e35) --- .../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;