From owner-svn-ports-all@freebsd.org Thu Mar 12 18:52:30 2020 Return-Path: Delivered-To: svn-ports-all@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 903DD268913; Thu, 12 Mar 2020 18:52:30 +0000 (UTC) (envelope-from jbeich@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ddHK5JfDz4CMT; Thu, 12 Mar 2020 18:52:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B78C29AFA; Thu, 12 Mar 2020 18:52:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02CIqT8m009531; Thu, 12 Mar 2020 18:52:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CIqTjC009530; Thu, 12 Mar 2020 18:52:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003121852.02CIqTjC009530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 12 Mar 2020 18:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528312 - head/www/firefox/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/www/firefox/files X-SVN-Commit-Revision: 528312 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 18:52:30 -0000 Author: jbeich Date: Thu Mar 12 18:52:29 2020 New Revision: 528312 URL: https://svnweb.freebsd.org/changeset/ports/528312 Log: www/firefox: sync STL bugfix with upstream Makes it easy to not forget to remove on update. Modified: head/www/firefox/files/patch-bug1594027 (contents, props changed) Modified: head/www/firefox/files/patch-bug1594027 ============================================================================== --- head/www/firefox/files/patch-bug1594027 Thu Mar 12 18:46:07 2020 (r528311) +++ head/www/firefox/files/patch-bug1594027 Thu Mar 12 18:52:29 2020 (r528312) @@ -1,29 +1,33 @@ -Disable STL wrappers in some places to help libc++ 9 +commit 9949bb054e7a +Author: Greg V +Date: Mon Feb 24 20:18:01 2020 +0000 -diff --git config/external/rlbox/moz.build config/external/rlbox/moz.build -index d216e62cad861..391bbdf566b88 100644 ---- config/external/rlbox/moz.build -+++ config/external/rlbox/moz.build -@@ -26,4 +26,7 @@ SOURCES += [ - 'rlbox_thread_locals.cpp' - ] + Bug 1594027 - add more STL wrappers to fix build with libc++ 9 r=froydnj + + Differential Revision: https://phabricator.services.mozilla.com/D62847 + + --HG-- + extra : moz-landing-system : lando +--- + config/gcc-stl-wrapper.template.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git config/gcc-stl-wrapper.template.h config/gcc-stl-wrapper.template.h +index 41ae14024b0c0..9fe70fbaab8dc 100644 +--- config/gcc-stl-wrapper.template.h ++++ config/gcc-stl-wrapper.template.h +@@ -32,6 +32,14 @@ + # define moz_dont_include_mozalloc_for_cstdlib + #endif -+# bug 1594027 -+DisableStlWrapping() ++#ifndef moz_dont_include_mozalloc_for_type_traits ++# define moz_dont_include_mozalloc_for_type_traits ++#endif + - FINAL_LIBRARY = 'xul' -\ No newline at end of file -diff --git gfx/graphite2/src/moz.build gfx/graphite2/src/moz.build -index 447cd861126a3..8a4fcd814e6fb 100755 ---- gfx/graphite2/src/moz.build -+++ gfx/graphite2/src/moz.build -@@ -69,6 +69,9 @@ if CONFIG['MOZ_WASM_SANDBOXING_GRAPHITE']: - # thebes - DefineAndWasmDefine('GRAPHITE2_STATIC', True) - -+# bug 1594027 -+DisableStlWrapping() ++#ifndef moz_dont_include_mozalloc_for_limits ++# define moz_dont_include_mozalloc_for_limits ++#endif + - # We allow warnings for third-party code that can be updated from upstream. - AllowCompilerWarnings() - + // Include mozalloc after the STL header and all other headers it includes + // have been preprocessed. + #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \