From nobody Wed Oct 30 18:28:24 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 4Xdwc86J4xz5bnns; Wed, 30 Oct 2024 18:28:24 +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 4Xdwc85C3nz4Qgl; Wed, 30 Oct 2024 18:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730312904; 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=1zmWZhUXbmruZx+iOMXrvf0xhgA/NrJuNTwQkSs6kYY=; b=cxiOmDJLCXK3FwnByo5NibHhZN7mOT6pErUE7toyGEIj8/waCLkTPDnz2OkMnEH57B5uSB hAsmHsneIIjWvG62ed3CQj0kS4LjPgoLBhTgEnq/sRCrfDlD2qItiMQy0plvoHW4dGBbSD XMMmNZi8AAcfVcqXbrT619p/MtFR6kBPUjt+WnwPtFeRU3P8zNFsxcL3VRceY3cm0hzetW YmWOmMXO5dY7I5OGmJ+2bsCthkv7K+UpJPtXL6J9KUvxhXuG10XRZEvpUOxrDdC4QvvOuv M2EjbAD1l6R6qAF7xX9TyWShSGjPIuoASVPjjXWIHmnjgczQLZms3IhgbhQImg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730312904; 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=1zmWZhUXbmruZx+iOMXrvf0xhgA/NrJuNTwQkSs6kYY=; b=aRszC/EXpJPHjCULzEjJRUPYkOGCYG0m5VpxpdGvn4gRbHoOMg6lYxj6UlGwIRbtcos835 hM5BfCH/uQcO2P6E5DlxAan0o+0Bw1y6PXkRAnaDo7PhHAs/Y9/LsLFGOJ5KmbhYDWbZ1X eaASqz+p2VxgJtYW9Sgzz5iVyuYLJbkFf6IFEpaHljIA5GxgMdx5mktKP5zDXrcynM6Ice kc4QUPTMMPoWfWYRXEW0Y1z6+Wrq1EXFUjo3G9B1R8zhRfLG04pQKliB7JmvQYblVUD7ha 7vbt3qqJJYxxl/sI8s5LXg3WHnnsFoJXt1ZU95WwAsQd9MjVs1yOt/GcNTtz0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730312904; a=rsa-sha256; cv=none; b=tANcVNOudMHFL5ASLcaXJ+QZyKsD8poF2KXHM5xLJl/foJ9FHKWCF9NuKCPSe4YdQgRPv9 fCaXu/Aclex+tQL4YzIly2Z5eb1fOjby4sIVOJVlJwHivQJ3eTQxexGTUEPKq+eu0ej8r3 mdWSY3rhHGHjb1PB5W+9AjvWN+TRPMokE6F6gV1F6K7a7szZP7k/6WnBFSdk/ipUwDzWcL tWwv/YKb4HMemzhRrU6f14l36SpGHaWWcCP/eVc0upnHpQIiFHJsPZyIXziHQWq8A4eUXG 89ZI/ZjdakjeLiK4xgog/G4pe8UFAOwdR2j5t7nMwATypG76kjYO3TrNLkqupA== 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 4Xdwc84hC0z1Hy1; Wed, 30 Oct 2024 18:28:24 +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 49UISOG7054668; Wed, 30 Oct 2024 18:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UISO9B054665; Wed, 30 Oct 2024 18:28:24 GMT (envelope-from git) Date: Wed, 30 Oct 2024 18:28:24 GMT Message-Id: <202410301828.49UISO9B054665@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: df7422d81ae5 - main - devel/librevisa: 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/main X-Git-Reftype: branch X-Git-Commit: df7422d81ae570a17b48662af9f20f464f12b076 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=df7422d81ae570a17b48662af9f20f464f12b076 commit df7422d81ae570a17b48662af9f20f464f12b076 Author: Dimitry Andric AuthorDate: 2024-10-17 14:28:46 +0000 Commit: Dimitry Andric CommitDate: 2024-10-30 18:22:30 +0000 devel/librevisa: 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 devel/librevisa 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, | ^ usb/usb_resource_creator.cpp:73:20: note: in instantiation of template class 'std::basic_string' requested here 73 | usb_string serial; | ^ /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 `usb_string` type. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 282165 MFH: 2024Q4 --- .../librevisa/files/patch-src_usb_usb__resource__creator.cpp | 11 +++++++++++ devel/librevisa/files/patch-src_usb_usb__string.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp b/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp new file mode 100644 index 000000000000..79a54c12a5d4 --- /dev/null +++ b/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp @@ -0,0 +1,11 @@ +--- src/usb/usb_resource_creator.cpp.orig 2013-04-08 15:47:56 UTC ++++ src/usb/usb_resource_creator.cpp +@@ -293,7 +293,7 @@ bool usb_resource::creator::open_device_and_get_serial + { + uint8_t bLength; + uint8_t bDescriptorType; +- uint16_t bString[0]; ++ char16_t bString[0]; + }; + + /// @todo may not be portable everywhere diff --git a/devel/librevisa/files/patch-src_usb_usb__string.h b/devel/librevisa/files/patch-src_usb_usb__string.h new file mode 100644 index 000000000000..d7bc6393e889 --- /dev/null +++ b/devel/librevisa/files/patch-src_usb_usb__string.h @@ -0,0 +1,11 @@ +--- src/usb/usb_string.h.orig 2013-01-07 10:35:29 UTC ++++ src/usb/usb_string.h +@@ -25,7 +25,7 @@ namespace usb { + namespace librevisa { + namespace usb { + +-typedef std::basic_string usb_string; ++typedef std::basic_string usb_string; + + } + }