From owner-dev-commits-ports-branches@freebsd.org Tue May 18 08:39:56 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB3BE644EB5; Tue, 18 May 2021 08:39:56 +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 4FkqF82pLJz4SjB; Tue, 18 May 2021 08:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 483081C60C; Tue, 18 May 2021 08:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14I8duSX058963; Tue, 18 May 2021 08:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14I8du3f058962; Tue, 18 May 2021 08:39:56 GMT (envelope-from git) Date: Tue, 18 May 2021 08:39:56 GMT Message-Id: <202105180839.14I8du3f058962@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: 8ed133d651cb - 2021Q2 - www/firefox-esr: fix build with clang/libc++12 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/2021Q2 X-Git-Reftype: branch X-Git-Commit: 8ed133d651cb393faed167f20e0facb0fb81d45d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 08:39:56 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ed133d651cb393faed167f20e0facb0fb81d45d commit 8ed133d651cb393faed167f20e0facb0fb81d45d Author: Christoph Moench-Tegeder AuthorDate: 2021-05-18 08:34:50 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-18 08:39:42 +0000 www/firefox-esr: fix build with clang/libc++12 Reported by: dim Obtained from: https://bugzilla.mozilla.org/show_bug.cgi?id=1694575 PR: 255953 (cherry picked from commit d68bbde38e14ca3ac14b0c21b9f1a0c0a3928d2b) --- www/firefox-esr/files/patch-bug1694575 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/www/firefox-esr/files/patch-bug1694575 b/www/firefox-esr/files/patch-bug1694575 new file mode 100644 index 000000000000..bbc563272934 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1694575 @@ -0,0 +1,33 @@ +changeset: 569030:f875a4ffd653 +user: Mike Hommey +date: Sun Feb 28 17:47:27 2021 +0000 +summary: Bug 1694575 - Don't include mozalloc.h from the iosfwd wrapper. r=andi + +diff -r d31bf2fc599d -r f875a4ffd653 config/gcc-stl-wrapper.template.h +--- config/gcc-stl-wrapper.template.h Sun Feb 28 14:59:31 2021 +0000 ++++ config/gcc-stl-wrapper.template.h Sun Feb 28 17:47:27 2021 +0000 +@@ -27,7 +27,11 @@ + // # define _GLIBCXX_DEBUG 1 + #endif + +-// Don't include mozalloc for cstdlib. See bug 1245076. ++// Don't include mozalloc.h for cstdlib, type_traits, limits and iosfwd. ++// See bug 1245076 (cstdlib), bug 1594027 (type_traits, limits) and ++// bug 1694575 (iosfwd). ++// Please be careful when adding more exceptions, especially regarding ++// the header not directly or indirectly including . + #ifndef moz_dont_include_mozalloc_for_cstdlib + # define moz_dont_include_mozalloc_for_cstdlib + #endif +@@ -40,6 +44,10 @@ + # define moz_dont_include_mozalloc_for_limits + #endif + ++#ifndef moz_dont_include_mozalloc_for_iosfwd ++# define moz_dont_include_mozalloc_for_iosfwd ++#endif ++ + // Include mozalloc after the STL header and all other headers it includes + // have been preprocessed. + #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ +