From nobody Mon Nov 4 07:38:00 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 4XhjxN6ybrz5cN2s; Mon, 04 Nov 2024 07:38:00 +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 4XhjxN6Fdzz4sFL; Mon, 4 Nov 2024 07:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705880; 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=aVD9wbZM0ZVqZnWS2zAau6E0BTZYAiOuXT5Z21YurqE=; b=GzkEu9djlp7BKWeEObi3zurOVGmXHabjb+Yj9ZB9H7PgAjdL7pAwrC8c6fO5MU+ugZy96O R6O6dCpvfaLz8ZiYpuwUtnZ3JNkMyrabjiFisx9/kCnXQsfbho2Eo9hI7S/9wDqtWvZVtA BJPEMYpA9iefzK7V5we1UTa3vhM+AzYEzAOupwp9f6pqngTTCfIlyEgm7+r/4AVEagOypm wg+wRZtkZRPsuRciwSmyRx3gRvVvmJkKs7r2NCic5fM5I5261zUL/GK1RH4AoLVfTpKbJq +WJGyb0ho5TQkSYxaNj4Dw+8OaNCIz5QB4Ce1NLzEMNjdfX6V86lKM7HMfQqig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705880; 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=aVD9wbZM0ZVqZnWS2zAau6E0BTZYAiOuXT5Z21YurqE=; b=b4dync2j6bMJXkE/11n+HE0aryXOcA9CPlhHxpSsklw51WLf3QPTPwWdpcw9s5qH3D09xd 5s0TbA8VP3fOUbNd7+nvDqmD2Pv1kOESSHt+EpyiuEWP60mVNltvh3d5Mt0jT/AXDLqZ07 fSADQSPdWm9kbMGwpBuVfjKVqE0jlfjijtpI387HIenRCDdKYPC+GqM3s4rUeCdPz/Gr03 K2Huq7q5k4jmSaBWSXfdcF02tFBq1xjBbukZkcpMMnrVZ9MosuPC0Vo0+GUNhffJZkz7BA fLrWp/O9X+IlGAqbuNW8dPBn/QDI9pRAmjEGZLXS9bUuuWW3L/6AAMxvFnbAWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730705880; a=rsa-sha256; cv=none; b=bwy4kljijZUSUK9LgMci4KtORay9Ei9jQAVIrmuIRc5dYtB2vMIavbkX/2nZM+G4lKOEc/ b3gs3q1fG0CXEhW0PfNAjvd63RuY5/rzekdlDWoNd4uJEph/nwzjUFqbC6qjVqUNe/t0tI CqkAI3OXJxTdAT+M1VGmzJ/o4kX+74TU0HcWiy3Cda5PFicJNJGdESAThXbhvqxncSYPRB IvBfzUwsKEITL218ZbgdV4PeI3Dv4Ms2AQ7TRoqRm+BSXGCfmnOQF1qQ2yeC5uZiIoSqG7 5DV1I4YV86PPEX8XwGxQGGLakYk2IrnVPrpo69jaLqqTBEdQl8JMmnVE0bEdxg== 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 4XhjxN5bvGzPPf; Mon, 4 Nov 2024 07:38:00 +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 4A47c0Ku044455; Mon, 4 Nov 2024 07:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A47c0Ir044452; Mon, 4 Nov 2024 07:38:00 GMT (envelope-from git) Date: Mon, 4 Nov 2024 07:38:00 GMT Message-Id: <202411040738.4A47c0Ir044452@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: dcc7cc48114b - main - x11-wm/blackbox: 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: dcc7cc48114b3730934be4236f63b5cdc0fa9821 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcc7cc48114b3730934be4236f63b5cdc0fa9821 commit dcc7cc48114b3730934be4236f63b5cdc0fa9821 Author: Dimitry Andric AuthorDate: 2024-11-03 21:51:48 +0000 Commit: Dimitry Andric CommitDate: 2024-11-04 07:36:54 +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 --- 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.