From 8e8ef3deb407ff549eba6d5310e0988f1f49a9c5 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 10 Aug 2024 15:48:05 +0200 Subject: [PATCH] lang/spidermonkey102: fix build with clang and libc++ 19 Clang 19 now diagnoses incorrect member accesses, which causes lang/spidermonkey102 to fail with an error similar to: /wrkdirs/usr/ports/lang/spidermonkey102/work/firefox-102.9.0/js/src/threading/ExclusiveData.h:113:29: error: reference to non-static member function must be called 113 | : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) { | ~~~~^~~~ Upstream fixed this for https://bugzilla.mozilla.org/1894423 in changeset 223087fdc29f18678f6174e9807b8780e439acf6 [2], so pull this in as a patch and apply it. Also, 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. With lang/spidermonkey102 and clang/libc++ 19 this results in errors similar to: /wrkdirs/usr/ports/lang/spidermonkey102/work/firefox-102.9.0/js/src/builtin/intl/Locale.cpp:208:20: error: implicit instantiation of undefined template 'std::char_traits' 208 | iter_ = std::char_traits::find( | ^ /wrkdirs/usr/ports/lang/spidermonkey102/work/firefox-102.9.0/js/src/builtin/intl/Locale.cpp:769:21: note: in instantiation of member function 'SepKeywordIterator::next' requested here 769 | beginKey = iter.next(); | ^ /wrkdirs/usr/ports/lang/spidermonkey102/work/firefox-102.9.0/js/src/builtin/intl/Locale.cpp:808:16: note: in instantiation of function template specialization 'FindUnicodeExtensionType' requested here 808 | ? FindUnicodeExtensionType(unicodeExtension->latin1Chars(nogc), | ^ Upstream fixed this for https://bugzilla.mozilla.org/1849070 in changeset 68ff4d3f7338248b4d67cf03aade5a73f8d396b2 [3], so pull this in as a patch and apply it. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://hg.mozilla.org/mozilla-central/rev/223087fdc29f18678f6174e9807b8780e439acf6 [3] https://hg.mozilla.org/mozilla-central/rev/68ff4d3f7338248b4d67cf03aade5a73f8d396b2 PR: 280730 Approved by: nc (maintainer) MFH: 2024Q3 --- lang/spidermonkey102/Makefile | 4 ++++ lang/spidermonkey102/distinfo | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile index 2dcc65a9860c..2dcf5dbc8eaa 100644 --- a/lang/spidermonkey102/Makefile +++ b/lang/spidermonkey102/Makefile @@ -5,6 +5,10 @@ MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} DISTNAME= firefox-${DISTVERSION}esr.source +PATCH_SITES= https://hg.mozilla.org/mozilla-central/raw-rev/ +PATCHFILES+= 223087fdc29f18678f6174e9807b8780e439acf6:-p1 # https://bugzilla.mozilla.org/1894423 +PATCHFILES+= 68ff4d3f7338248b4d67cf03aade5a73f8d396b2:-p1 # https://bugzilla.mozilla.org/1849070 + MAINTAINER= nc@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 102-esr WWW= https://spidermonkey.dev/ diff --git a/lang/spidermonkey102/distinfo b/lang/spidermonkey102/distinfo index 527709ca1067..7f0c41512d66 100644 --- a/lang/spidermonkey102/distinfo +++ b/lang/spidermonkey102/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1720131181 +TIMESTAMP = 1723296424 SHA256 (firefox-102.9.0esr.source.tar.xz) = 31b074623f09ca821a8a7dee0b3d2df1a45f1164264d31c26b4969a4d6a21dd1 SIZE (firefox-102.9.0esr.source.tar.xz) = 484308672 +SHA256 (223087fdc29f18678f6174e9807b8780e439acf6) = f234371584e2b2bc9953ae4fd145da19c99a6f04087f53d59616aecf29df039c +SIZE (223087fdc29f18678f6174e9807b8780e439acf6) = 1597 +SHA256 (68ff4d3f7338248b4d67cf03aade5a73f8d396b2) = 8d556dcb0d3a76a6cb8870b6eff45fafe0a78760ea24d34ea0b5e7ceb4489a71 +SIZE (68ff4d3f7338248b4d67cf03aade5a73f8d396b2) = 2546