From nobody Mon Nov 4 07:38:45 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 4XhjyG18pKz5cNVv; Mon, 04 Nov 2024 07:38:46 +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 4XhjyF65b2z4sKX; Mon, 4 Nov 2024 07:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705925; 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=9EPuByuE48JiNX+VzhSxVNMBsjHOIJP0GlKA7Do1c1I=; b=Dmtk0QFBaCTUqnyT7qsqbQlXPnY0h1yNJR1GiquwvAAeP2MlrRYiY3rsLVF75ziLKRdgm4 2XiCvbWUlGiw8o3T8OjRwZB7isdL4slcM0OXwBfp0hDdqQH+9LMmDbjiQfk+TbkvWTDBeV JuAp92ViljA51PF0KYivuIqrJSoNUnG9amFLPEhnORNvbtreNL4xCGctavngvhccN/5E4i HcxmRC6ObyDx2CQTArU8NNFzBp3z4uIsCsnUHa9FciWi/JYe7gQkPiX6I66a13a0g1Iik1 yliubmnHCI9jNC1zrHcLqyErviAppIvS4OnrjOWJCQo/qmP7+0ggKPLBObC/Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705925; 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=9EPuByuE48JiNX+VzhSxVNMBsjHOIJP0GlKA7Do1c1I=; b=CuV+L+3XADwAZyp9IL7g6KiTYJImUCX4o5vjUsf4se7zbkXW1hclsH9N9UhynO+eZcInSF aVW9vW5EFhjsNIhPrwCBKI7r+GzRWP+Qx+Hgis3tJMRRIm5q9iVrCIpd/FBGTDKLY22VH6 0Lae68WcM8Ab7j7U2WdRA/ATkgtCq6fkqZUE1nH9hQ1xDYiJ+cwgOzGle+yknBcG0p0eyA bC4ZmusNVtVB+IwbPrDWV6ui+4YlqE2cjlERZ8XtFKwUqgeZMeoyVYo2mnovKwWZJeLfXo 3zeBU/uPIlcQDn2GeH6MiRGG0d/D4JTHXLUCQHXXv20ILamD0YexQxxMCobbZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730705925; a=rsa-sha256; cv=none; b=YfDVGNLuCZYbW8jkEENR4apiuUFLYl+7wmHJlLeKsZqQF0Hl4u5NScuWHBTpKXr/+JM6oX 2TqpSQxxkd2nJIRUdXeMr7PHSIYpc5EUecg+xszm51Rt3R7ZJvy6leMm0f7hlbqBuhNhLG yIudpGEUPaRFyshXVG1JxtErNFaCTDafj51GIy2YNzUHvyxfhqE/mcXvBkQl1x1cA6fiAk lCPyGj35eo93oDiFD2hDkSW0ITJxp6BKQHLty/ngrZZcS4bTn+IU7xGGaNS6uHYXbXCwoN vkHzb1nAR7xs6o3yDyXJFZo6Z1cT1RQrPDZj3bN7OQ1ZRiYjdu8/cYLQsSvfRg== 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 4XhjyF39ngzPdK; Mon, 4 Nov 2024 07:38:45 +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 4A47cjW9044888; Mon, 4 Nov 2024 07:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A47cjql044885; Mon, 4 Nov 2024 07:38:45 GMT (envelope-from git) Date: Mon, 4 Nov 2024 07:38:45 GMT Message-Id: <202411040738.4A47cjql044885@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: a734ca4bddfd - 2024Q4 - x11-wm/blackbox: 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: a734ca4bddfd20b086b5a89a4ceedf8078ba9cc1 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=a734ca4bddfd20b086b5a89a4ceedf8078ba9cc1 commit a734ca4bddfd20b086b5a89a4ceedf8078ba9cc1 Author: Dimitry Andric AuthorDate: 2024-11-03 21:51:48 +0000 Commit: Dimitry Andric CommitDate: 2024-11-04 07:38:26 +0000 x11-wm/blackbox: 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-wm/blackbox 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, | ^ ./Menu.hh:82:13: note: in instantiation of template class 'std::basic_string' requested here 82 | ustring lbl; | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ This can be fixed by defining `Uchar` as `char32_t` instead of `unsigned int` in `Unicode.hh`. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 282525 Approved by: A.J.Caines@halplant.com (maintainer) MFH: 2024Q4 (cherry picked from commit dcc7cc48114b3730934be4236f63b5cdc0fa9821) --- x11-wm/blackbox/files/patch-lib_Unicode.hh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/x11-wm/blackbox/files/patch-lib_Unicode.hh b/x11-wm/blackbox/files/patch-lib_Unicode.hh new file mode 100644 index 000000000000..9308811909f9 --- /dev/null +++ b/x11-wm/blackbox/files/patch-lib_Unicode.hh @@ -0,0 +1,11 @@ +--- lib/Unicode.hh.orig 2005-01-03 09:42:53 UTC ++++ lib/Unicode.hh +@@ -37,7 +37,7 @@ namespace bt + /* + * Unicode character type. + */ +- typedef unsigned int Uchar; ++ typedef char32_t Uchar; + + /* + * Unicode string type.