From nobody Thu Apr 18 22:24:55 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 4VLC534hFPz5Hhdf; Thu, 18 Apr 2024 22:24:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLC532x0pz4cvq; Thu, 18 Apr 2024 22:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713479095; 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=P1i0NLFEQq7c+ZwOny6FIZj7P/zeVqGN66QFVxu4gzE=; b=VTYwIgnVSJvAvBzgasPlvSVNKf3G5c7GoeHZRfS6dCJB20w11dy+xYna2UxPdKDoMQAQ9+ r2xMZR/KrHjWg/4XIY7zfFWelGvqA/Tb0L/PPdxDw6l3U3J6buXzKi86vfIATKAnk6UUOl WMq+40ouHDRy0MRBpQw1BEuk36oGKNbANRmQe8Z6GcIl15sTf2SmA05ENILtXdbVI/2S1e RW+UQj5DjVnvzCZrMfASmagB30OtQnWfGUCTX5sS1ZHmglIcb+kuESoNRqhArLLr3jeUHW oChpZwE1Mm24zv8olnWICIPnj5Rc6HBbPfD6b7GOWTGe+d+hIROZ1+2cy1IFvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713479095; a=rsa-sha256; cv=none; b=RYfN5fqTqSzbMglxOb7yr7/TLD+r1jgzQ7WOdqkzWtKPUk3citsdJP4whYe08nGIBqgK9k 2ho1i/MXSJG48OZFRpEte/B0V5rR6kybn9KW5wurSB3G6YH9WCjy9Me5gaBW7asVIwDeK1 n62v1xA9eNm+NtwLh4WdjBYESqfD1us3WfD8BnJGV8xD8rxmketsiv6mKtbS0G1tCaf63F avt7yaRTBOSQhfkdXhkr6JngMwG4nLcDsW+3u+4IEYfJbpVCLcWQMeltlLXYNz59NIS5qL CyRJnjLCVsn3/G8PSsn+4Gx/flNbnDqPeTqX2E+Ir5JVTVyoWUGIJqQwhvsweA== 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=1713479095; 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=P1i0NLFEQq7c+ZwOny6FIZj7P/zeVqGN66QFVxu4gzE=; b=setdcX/Q0toCT1G+ZIPbmd7lIP8T51TMmc6Gi+rxOBhWET1g/kh4g6bcUhzP3hM3CrkhW1 RsuEabWAIWI+A33iEs8VLKvySzfVyREAUnf5PaWlIpoDf3chS9In2xGRghXFdmgj2H9xyg 0AL2SRDHN+eogqEKTNrDiWoXmZfpKpqkJwsHZVYCphmFchwFgWLQ8gUTpXgYf+T7/DgJ9p fNzVWRmEHzwa3cYertI7TQ+mmnp9XF03aBqR3W743vsaY/tVNG/pz5rfXW/vE5svug5N+L g/f1bDldieog1q17O+g/aECg876Aggyl6/qJDOJGYIY8pIifhm7WV5WuBmLWIg== 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 4VLC532YVCzS5Y; Thu, 18 Apr 2024 22:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IMOtbu043594; Thu, 18 Apr 2024 22:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IMOtXe043591; Thu, 18 Apr 2024 22:24:55 GMT (envelope-from git) Date: Thu, 18 Apr 2024 22:24:55 GMT Message-Id: <202404182224.43IMOtXe043591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 57e4cbd4127d - 2024Q2 - www/firefox-esr: fix build with libc++18 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 57e4cbd4127d160d7e4babd3b764fdab5f94eaaf Auto-Submitted: auto-generated The branch 2024Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=57e4cbd4127d160d7e4babd3b764fdab5f94eaaf commit 57e4cbd4127d160d7e4babd3b764fdab5f94eaaf Author: Christoph Moench-Tegeder AuthorDate: 2024-04-18 21:59:12 +0000 Commit: Christoph Moench-Tegeder 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 +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",