MFH: r552366

www/firefox: update to 82.0

Changes:	https://www.mozilla.org/firefox/82.0/releasenotes/
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2020-10-17 01:08:51 +00:00
parent d89bc22b5b
commit 66d7028601
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q4/; revision=552537
4 changed files with 23 additions and 8 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
DISTVERSION= 81.0.2
DISTVERSION= 82.0
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1602537269
SHA256 (firefox-81.0.2.source.tar.xz) = 91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44
SIZE (firefox-81.0.2.source.tar.xz) = 337759612
TIMESTAMP = 1602696047
SHA256 (firefox-82.0.source.tar.xz) = 90c58707f5bd34978e2d1bcadbe463556edc0878430f969893ae2f89c5d464c2
SIZE (firefox-82.0.source.tar.xz) = 334793772

View File

@ -2,15 +2,15 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi
index 855214a..1e91d51 100644
--- build/moz.configure/init.configure
+++ build/moz.configure/init.configure
@@ -251,6 +251,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
@@ -240,6 +240,7 @@ option(env='VIRTUALENV_NAME', nargs=1, default='init_p
@imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
@imports(_from='mozbuild.pythonutil', _import='python_executable_version')
@imports(_from='six', _import='ensure_text')
+@imports(_from='__builtin__', _import='KeyError')
def virtualenv_python3(env_python, build_env, mozconfig, help):
def virtualenv_python3(env_python, virtualenv_name, build_env, mozconfig, help):
# Avoid re-executing python when running configure --help.
if help:
@@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi
@@ -273,6 +274,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu
python = mozconfig['vars']['added']['PYTHON3']
elif 'PYTHON3' in mozconfig['vars']['modified']:
python = mozconfig['vars']['modified']['PYTHON3'][1]
@ -23,7 +23,7 @@ index 855214a..1e91d51 100644
log.debug("python3: executable from configuration: %r" % python)
@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi
@@ -358,7 +365,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu
sys.executable, manager.python_path))
log.info('Re-executing in the virtualenv')
if env_python:

View File

@ -0,0 +1,15 @@
Look for gm4 in addition to m4
diff --git build/moz.configure/old.configure build/moz.configure/old.configure
index 8c807c0794fab..5132228960f3d 100644
--- build/moz.configure/old.configure
+++ build/moz.configure/old.configure
@@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-m4 = check_prog('M4', ('m4',))
+m4 = check_prog('M4', ('gm4', 'm4',))
@depends(mozconfig)