Date: Thu, 18 Apr 2024 22:24:55 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 57e4cbd4127d - 2024Q2 - www/firefox-esr: fix build with libc++18 Message-ID: <202404182224.43IMOtXe043591@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=57e4cbd4127d160d7e4babd3b764fdab5f94eaaf commit 57e4cbd4127d160d7e4babd3b764fdab5f94eaaf Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2024-04-18 21:59:12 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2024-04-18 22:24:38 +0000 www/firefox-esr: fix build with libc++18 Reported By: cy (in thunderbird, but it's the same here) (cherry picked from commit 80332146fe4e6115917e478ed861c140dd9fc36e) --- www/firefox-esr/files/patch-bug1873379 | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/www/firefox-esr/files/patch-bug1873379 b/www/firefox-esr/files/patch-bug1873379 new file mode 100644 index 000000000000..658bc576eef1 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1873379 @@ -0,0 +1,34 @@ +commit 627cc80defb3fa48e82ce656536d666176b9f8d1 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sat Jan 13 14:35:33 2024 +0000 + + Bug 1873379 - Ignore std::tuple harder. r=firefox-style-system-reviewers,zrhoffman + + In libc++ 18 it seems to be in a nested namespace. Make sure to account + for that. + + Differential Revision: https://phabricator.services.mozilla.com/D198398 + +diff --git layout/style/ServoBindings.toml layout/style/ServoBindings.toml +index 2aea31f8f911..2deafbfb14b6 100644 +--- layout/style/ServoBindings.toml ++++ layout/style/ServoBindings.toml +@@ -366,6 +366,9 @@ opaque-types = [ + "std::namespace::atomic___base", "std::atomic__My_base", + "std::atomic", + "std::atomic___base", ++ "std::tuple.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571 ++ "std::.*::tuple.*", ++ + # We want everything but FontVariation and Float to be opaque but we don't + # have negative regexes. + "mozilla::gfx::(.{0,4}|.{6,12}|.{14,}|([^F][^o][^n][^t][^V][^a][^r][^i][^a][^t][^i][^o][^n])|([^F][^l][^o][^a][^t]))", +@@ -391,8 +394,6 @@ opaque-types = [ + # for clang. + "mozilla::SeenPtrs", + "mozilla::SupportsWeakPtr", +- "std::tuple", +- "std::tuple_.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571 + "SupportsWeakPtr", + "mozilla::detail::WeakReference", + "mozilla::WeakPtr",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404182224.43IMOtXe043591>