svn commit: r536538 - in head: Mk www/firefox www/firefox/files

Jan Beich jbeich at FreeBSD.org
Mon May 25 23:05:31 UTC 2020 

Author: jbeich
Date: Mon May 25 23:05:29 2020
New Revision: 536538
URL: https://svnweb.freebsd.org/changeset/ports/536538

Log:
  www/firefox: update to 77.0
  
  Changes:	https://www.mozilla.org/firefox/77.0/releasenotes/

Deleted:
  head/www/firefox/files/patch-bug1624128
  head/www/firefox/files/patch-bug1625431
  head/www/firefox/files/patch-bug1628690
Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/distinfo   (contents, props changed)
  head/www/firefox/files/patch-addon-search   (contents, props changed)
  head/www/firefox/files/patch-bug1288587   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Mon May 25 23:05:01 2020	(r536537)
+++ head/Mk/bsd.gecko.mk	Mon May 25 23:05:29 2020	(r536538)
@@ -72,6 +72,7 @@ USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrend
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 LDFLAGS+=		-Wl,--as-needed
+BINARY_ALIAS+=	python3=python${PYTHON3_DEFAULT}
 
 BUNDLE_LIBS=	yes
 

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Mon May 25 23:05:01 2020	(r536537)
+++ head/www/firefox/Makefile	Mon May 25 23:05:29 2020	(r536538)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	76.0.1
-PORTREVISION=	3
+DISTVERSION=	77.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Modified: head/www/firefox/distinfo
==============================================================================
--- head/www/firefox/distinfo	Mon May 25 23:05:01 2020	(r536537)
+++ head/www/firefox/distinfo	Mon May 25 23:05:29 2020	(r536538)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588879058
-SHA256 (firefox-76.0.1.source.tar.xz) = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3
-SIZE (firefox-76.0.1.source.tar.xz) = 323251680
+TIMESTAMP = 1590430077
+SHA256 (firefox-77.0.source.tar.xz) = df8fc50fa360b10de8076aa5409d6d97f361669d802e90d51651836d1d9ec348
+SIZE (firefox-77.0.source.tar.xz) = 332501524

Modified: head/www/firefox/files/patch-addon-search
==============================================================================
--- head/www/firefox/files/patch-addon-search	Mon May 25 23:05:01 2020	(r536537)
+++ head/www/firefox/files/patch-addon-search	Mon May 25 23:05:29 2020	(r536538)
@@ -5,18 +5,16 @@ diff --git browser/app/profile/firefox.js browser/app/
 index 75c2c5e435e35..4d8c09c02759b 100644
 --- browser/app/profile/firefox.js
 +++ browser/app/profile/firefox.js
-@@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru
+@@ -37,7 +37,7 @@ pref("extensions.webextOptionalPermissionPrompts", true);
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%");
-+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%");
  pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
  pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%");
  pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
-@@ -169,8 +169,8 @@ pref("app.update.url", "https://aus5.mozilla.org/updat
+@@ -168,8 +168,8 @@ pref("app.update.staging.enabled", true);
  //  .. etc ..
  //
  pref("extensions.update.enabled", true);

Modified: head/www/firefox/files/patch-bug1288587
==============================================================================
--- head/www/firefox/files/patch-bug1288587	Mon May 25 23:05:01 2020	(r536537)
+++ head/www/firefox/files/patch-bug1288587	Mon May 25 23:05:29 2020	(r536538)
@@ -2,48 +2,15 @@ diff --git a/build/moz.configure/init.configure b/buil
 index 855214a..1e91d51 100644
 --- build/moz.configure/init.configure
 +++ build/moz.configure/init.configure
-@@ -252,6 +252,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
- @imports(_from='mozbuild.pythonutil', _import='find_python2_executable')
- @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
- @imports(_from='six', _import='ensure_text')
-+ at imports(_from='__builtin__', _import='KeyError')
- def virtualenv_python2(env_python, build_env, mozillabuild, mozconfig, help):
-     if help:
-         return
-@@ -283,6 +284,12 @@ def virtualenv_python2(env_python, build_env, mozillab
-             python = mozconfig['vars']['added']['PYTHON']
-         elif 'PYTHON' in mozconfig['vars']['modified']:
-             python = mozconfig['vars']['modified']['PYTHON'][1]
-+        for i in ('env', 'vars'):
-+            for j in ('added', 'modified'):
-+                try:
-+                    del mozconfig[i][j]['PYTHON']
-+                except KeyError:
-+                    pass
- 
-     log.debug("python2: executable from configuration: %r" % python)
- 
-@@ -365,7 +372,10 @@ def virtualenv_python2(env_python, build_env, mozillab
-                 sys.executable, manager.python_path))
-             log.info('Reexecuting in the virtualenv')
-             if env_python:
--                del os.environ['PYTHON']
-+                try:
-+                    del os.environ['PYTHON']
-+                except KeyError:
-+                    pass
-             # One would prefer to use os.execl, but that's completely borked on
-             # Windows.
-             sys.exit(subprocess.call([python] + sys.argv))
-@@ -468,6 +478,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
+@@ -252,6 +252,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
  @imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
  @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
  @imports(_from='six', _import='ensure_text')
 + at imports(_from='__builtin__', _import='KeyError')
- def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
+ def virtualenv_python3(env_python, build_env, mozconfig, help):
+     # Avoid re-executing python when running configure --help.
      if help:
-         return
-@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -284,6 +285,12 @@ def virtualenv_python3(env_python, build_env, mozconfi
              python = mozconfig['vars']['added']['PYTHON3']
          elif 'PYTHON3' in mozconfig['vars']['modified']:
              python = mozconfig['vars']['modified']['PYTHON3'][1]
@@ -56,7 +23,7 @@ index 855214a..1e91d51 100644
  
      log.debug("python3: executable from configuration: %r" % python)
  
-@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -373,7 +380,10 @@ def virtualenv_python3(env_python, build_env, mozconfi
                  sys.executable, manager.python_path))
              log.info('Re-executing in the virtualenv')
              if env_python:

More information about the svn-ports-all mailing list