From nobody Mon Aug 12 19:46:59 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 4WjQ5H4vp2z5T1TB; Mon, 12 Aug 2024 19:46:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjQ5H2Zrhz4MSr; Mon, 12 Aug 2024 19:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723492019; 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=63gtAbLAShv2P/yEBuo2S2G7tOz58dXX5p/oHwYMGUA=; b=NbWwZQUUqZyAdJMepsb3b+vrS87RRtjY5y2CYf+2KH+6ay37ymwZq4c5RpX6sQjkeCDgaZ l085bcwGTFE2at6o4RUyYPt4WY/PhLpzuddV7xEnaxhi3B9c81Iz+xnVsks+VQUdobEtqk hiZCmijk64zkSiEXR3KdfIRU2B36PhYvJKzXKuST+FbWVHYS1eGQhgneOHkztixzcd/j1f 7TQs9dv5nAHAlarXGPBhPQtFYcwNIQ6E3qvpMcE9A3MR48d83RfRvO4bXDqFS6PJHGfxDK ttXx0OXnVNEoK7130BvmslYgmMYVX1ZAP3U3nqyjsTq73wqLAJ+J5e+eC7G4lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723492019; a=rsa-sha256; cv=none; b=uamICZH6GFrrCSr6Nu2TJO5/B7EYuvv5jDnEcRXothsuyvC/bU/IwAMK6ZoO0ElY9gk4b8 Utof6uH2KpNwPPSK8zuT1Me3W5529lofzpEYlKcWzvkzEnlbRRmFinJUFPw7+MkFoHYHwv xR99KfXhDG+zCQVQouW/2SfDaZ4AlaOKBQLYOspoijW804LOQauAYqzVr82x8AXJQB+Hd0 aIE0xLXeYN+Ffz5j5i/cfsYuGtOjhU0KCOCdm/UCALMYLmDM7nzunXWMsJCorn5qGO+4SI 49BehWkkOJMxKbkbe8ruLCKK8LGoaLzFC+gzdcFn/ifCpkZ23XQknq1P/VLYUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723492019; 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=63gtAbLAShv2P/yEBuo2S2G7tOz58dXX5p/oHwYMGUA=; b=W3WKcr91kzNuMeexeUv23e7nnBTXL4J43N5YdaLqd+dyv0f+MAcU5qwQ7RrC/lEjrVjrl0 UHLy5ZSftrWXZXnzBEdy1rIKJfxszTFAxDduKInwxMkeIgFnkJCkVLhWNyoF4fMyx7N1+R jR3U2l7etJ5ORL7vo/M3sqOulNL7dLhk2smietsK+AamR5nGlnpRsRroZVepLg3J85K8ix xH268/iKlRy68Le8OJBZdbCTF8yZey1oQHg8/bLuMhWAO5+6xJfD454p1I9uA0YkYVMnd5 t+oV+TyYhcAhWeYnzqRDnuhJMtRAyfdiMYOlpqSz7zswBthNW+9SyvRE3FnZeg== 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 4WjQ5H2BB3zgsL; Mon, 12 Aug 2024 19:46:59 +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 47CJkxiT034519; Mon, 12 Aug 2024 19:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CJkxPb034516; Mon, 12 Aug 2024 19:46:59 GMT (envelope-from git) Date: Mon, 12 Aug 2024 19:46:59 GMT Message-Id: <202408121946.47CJkxPb034516@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: ba047c5711db - 2024Q3 - lang/spidermonkey102: fix build with clang and 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/2024Q3 X-Git-Reftype: branch X-Git-Commit: ba047c5711db7512124836e092e428546ca78eef Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba047c5711db7512124836e092e428546ca78eef commit ba047c5711db7512124836e092e428546ca78eef Author: Dimitry Andric AuthorDate: 2024-08-10 13:48:05 +0000 Commit: Dimitry Andric CommitDate: 2024-08-12 19:46:24 +0000 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 (cherry picked from commit 8e8ef3deb407ff549eba6d5310e0988f1f49a9c5) --- 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 3ca6eb71ddda..fedbe464f4dc 100644 --- a/lang/spidermonkey102/Makefile +++ b/lang/spidermonkey102/Makefile @@ -6,6 +6,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 fb023b99e723..b3cc23b67d1d 100644 --- a/lang/spidermonkey102/distinfo +++ b/lang/spidermonkey102/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1667756158 +TIMESTAMP = 1723491894 SHA256 (firefox-102.4.0esr.source.tar.xz) = e79f0ddd4914dfbff61c5eea7ff28ad2dd12ecfbf3d63a41dab57d50171d904e SIZE (firefox-102.4.0esr.source.tar.xz) = 482118312 +SHA256 (223087fdc29f18678f6174e9807b8780e439acf6) = f234371584e2b2bc9953ae4fd145da19c99a6f04087f53d59616aecf29df039c +SIZE (223087fdc29f18678f6174e9807b8780e439acf6) = 1597 +SHA256 (68ff4d3f7338248b4d67cf03aade5a73f8d396b2) = 8d556dcb0d3a76a6cb8870b6eff45fafe0a78760ea24d34ea0b5e7ceb4489a71 +SIZE (68ff4d3f7338248b4d67cf03aade5a73f8d396b2) = 2546