From nobody Wed Oct 30 18:29:43 2024 X-Original-To: dev-commits-ports-branches@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 4Xdwdg61Fyz5bp82; Wed, 30 Oct 2024 18:29:43 +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 4Xdwdg5TPRz4R2n; Wed, 30 Oct 2024 18:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730312983; 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=3lozV1S4lUZx0YmneiKMqh/W44NXg1DDhm5D6E/eM/E=; b=fziimol07Xa7KTdryMGrY5cwvug1L8N0Djvsfjgb6F6KBwKSvHDo7jzQZs5wI7E+YMkqAd Ncy9pW4ZEIT/cKvPCniyVwcotIRSV1GeLmnm2/KeYhL8jTa1n9szVEHIfve7xE+YSa1Cb1 pgC2RNfriOgNYUjqw9hnwpCECEOUwdvKBPUtsC3oFUy3HfBPkOK81zaPnGg7ZKAehzu1fd QHrya0gSiyaJNrlfDHVrA/gDYvkEGX/g7+x/utLmFJTasrm/Zq/PYcMCtFO+JCY0C0GGwb wvSdQ8BzY2b6PKE64NIwj4zVEl+2FE0AGGTPRu7aVhPFYfvTCFYVuFcYbIuJqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730312983; 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=3lozV1S4lUZx0YmneiKMqh/W44NXg1DDhm5D6E/eM/E=; b=g2IF0otObbgd1MujvjhwvfdYHl5E/coPykdBs2Pbj/KdWrLW1/Nz7k2qNM6cyOsVyT+V2B qqTwdKaJstTZcBKQK+p9d31BBFQ2YD7F1c0/4yMWCj58f31L2yT6wTko1hgOfW4Hk8FibJ qype99cnIHTLQkP+4FEzR412C+0tT/R+qdumBmnvrkSiTyi/VJ8g4/kECPX3rkXlml6UYH lTUMrYwioGTlfOgjbRysvrxbSEkSMTT2QfZKE4HjY3EXpXM47wubUfLtsFJnf1jgykQkys JRjXlB2GQh4mUTBNZYAL2etIa0poH0SvygBhAv6U+GO5fgQqr7r9nAotiEociQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730312983; a=rsa-sha256; cv=none; b=FxtifPxhTYWfRsWlCpSTZ8l9OzxG0Nduhiig11eva6uwnKTBs9BUAxmMnkwX7E5UEUuKJe zK4uy7UUWhCJYhUNmpmZJAy6OB12jAfimxpCB40c+Qv33PyonbZpHQ76wtWJ7mi+4eS75i +XpQRHTIMHXT7qlQwcY/kTxziZLvvprTK4ELY9K8cpW/urPnyjtBJJK6WexjeR8PyOO2vN H+Ed/SxYRAoISe5qoreOruKk3wPWz3K4pL79nljrMyqaex7UXMsQJ6R8lpjaEnEA7/xxTl BA5YeuK3jsp+QEZB67hFP36X+regtiPYXGj7MkfTNeLy9O4QCuyT22uWhlV1/Q== 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 4Xdwdg4hc1z1HwL; Wed, 30 Oct 2024 18:29: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 49UITht3055175; Wed, 30 Oct 2024 18:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UITh5W055172; Wed, 30 Oct 2024 18:29:43 GMT (envelope-from git) Date: Wed, 30 Oct 2024 18:29:43 GMT Message-Id: <202410301829.49UITh5W055172@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: 00dce14954e1 - 2024Q4 - devel/librevisa: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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: 00dce14954e15cd7bf837456ab396b5d21da29b8 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=00dce14954e15cd7bf837456ab396b5d21da29b8 commit 00dce14954e15cd7bf837456ab396b5d21da29b8 Author: Dimitry Andric AuthorDate: 2024-10-17 14:28:46 +0000 Commit: Dimitry Andric CommitDate: 2024-10-30 18:29:00 +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 (cherry picked from commit df7422d81ae570a17b48662af9f20f464f12b076) --- .../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; + + } + }