svn commit: r533932 - in branches/2020Q2/www/firefox: . files

Jan Beich jbeich at FreeBSD.org
Mon May 4 16:59:35 UTC 2020 

Author: jbeich
Date: Mon May  4 16:59:33 2020
New Revision: 533932
URL: https://svnweb.freebsd.org/changeset/ports/533932

Log:
  MFH: r533209 r533408
  
  www/firefox: update to 76.0
  
  - Add a workaround for Clang [1]
  
  Changes:	https://www.mozilla.org/firefox/76.0/releasenotes/
  PR:		245422
  Submitted by:	tobik [1]
  Security:	aec18162-eaf3-4e73-a38e-3fd98bc47869
  Approved by:	ports-secteam blanket
  Differential Revision:	https://reviews.freebsd.org/D24326

Added:
  branches/2020Q2/www/firefox/files/patch-bug1628567
     - copied unchanged from r533209, head/www/firefox/files/patch-bug1628567
Deleted:
  branches/2020Q2/www/firefox/files/patch-bug1612377
  branches/2020Q2/www/firefox/files/patch-bug1619258
  branches/2020Q2/www/firefox/files/patch-bug1622551
Modified:
  branches/2020Q2/www/firefox/Makefile
  branches/2020Q2/www/firefox/distinfo
  branches/2020Q2/www/firefox/files/patch-bug1288587
  branches/2020Q2/www/firefox/files/patch-bug1550891
  branches/2020Q2/www/firefox/files/patch-bug847568
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/www/firefox/Makefile
==============================================================================
--- branches/2020Q2/www/firefox/Makefile	Mon May  4 16:56:44 2020	(r533931)
+++ branches/2020Q2/www/firefox/Makefile	Mon May  4 16:59:33 2020	(r533932)
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	75.0
-PORTREVISION=	2
+DISTVERSION=	76.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.25:devel/nspr \
-		nss>=3.51:security/nss \
+		nss>=3.51.1:security/nss \
 		icu>=64.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.6.4:print/harfbuzz \
-		graphite2>=1.3.13:graphics/graphite2 \
+		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3 at py${PYTHON3_DEFAULT:S/.//} \

Modified: branches/2020Q2/www/firefox/distinfo
==============================================================================
--- branches/2020Q2/www/firefox/distinfo	Mon May  4 16:56:44 2020	(r533931)
+++ branches/2020Q2/www/firefox/distinfo	Mon May  4 16:59:33 2020	(r533932)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585942574
-SHA256 (firefox-75.0.source.tar.xz) = bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f
-SIZE (firefox-75.0.source.tar.xz) = 324614064
+TIMESTAMP = 1588197340
+SHA256 (firefox-76.0.source.tar.xz) = 3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8
+SIZE (firefox-76.0.source.tar.xz) = 323886744

Modified: branches/2020Q2/www/firefox/files/patch-bug1288587
==============================================================================
--- branches/2020Q2/www/firefox/files/patch-bug1288587	Mon May  4 16:56:44 2020	(r533931)
+++ branches/2020Q2/www/firefox/files/patch-bug1288587	Mon May  4 16:59:33 2020	(r533932)
@@ -23,7 +23,7 @@ index 855214a..1e91d51 100644
  
      log.debug("python2: executable from configuration: %r" % python)
  
-@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab
+@@ -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:
@@ -35,7 +35,7 @@ index 855214a..1e91d51 100644
              # One would prefer to use os.execl, but that's completely borked on
              # Windows.
              sys.exit(subprocess.call([python] + sys.argv))
-@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
+@@ -468,6 +478,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')
@@ -43,7 +43,7 @@ index 855214a..1e91d51 100644
  def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
      if help:
          return
-@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab
              python = mozconfig['vars']['added']['PYTHON3']
          elif 'PYTHON3' in mozconfig['vars']['modified']:
              python = mozconfig['vars']['modified']['PYTHON3'][1]
@@ -56,7 +56,7 @@ index 855214a..1e91d51 100644
  
      log.debug("python3: executable from configuration: %r" % python)
  
-@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab
                  sys.executable, manager.python_path))
              log.info('Re-executing in the virtualenv')
              if env_python:
@@ -65,6 +65,6 @@ index 855214a..1e91d51 100644
 +                    del os.environ['PYTHON3']
 +                except KeyError:
 +                    pass
-             # One would prefer to use os.execl, but that's completely borked on
-             # Windows.
-             sys.exit(subprocess.call([python] + sys.argv))
+             # Homebrew on macOS will change Python's sys.executable to a custom
+             # value which messes with mach's virtualenv handling code. Override
+             # Homebrew's changes with the correct sys.executable value.

Modified: branches/2020Q2/www/firefox/files/patch-bug1550891
==============================================================================
--- branches/2020Q2/www/firefox/files/patch-bug1550891	Mon May  4 16:56:44 2020	(r533931)
+++ branches/2020Q2/www/firefox/files/patch-bug1550891	Mon May  4 16:59:33 2020	(r533932)
@@ -72,10 +72,10 @@ index 0be9cce0b4bed..89e67483e4c16 100644
  #else
    // Generic Unix: shm_open + shm_unlink
    do {
-@@ -275,6 +282,13 @@ bool SharedMemory::Freeze() {
-     CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno);
+@@ -277,6 +284,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) {
      return false;
    }
+   ro_file = mapped_file_;
 +#elif defined(__FreeBSD__)
 +  cap_rights_t rights;
 +  cap_rights_init(&rights, CAP_MMAP_R);
@@ -83,6 +83,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644
 +    CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno);
 +    return false;
 +  }
++  ro_file = mapped_file_;
  #else
    DCHECK(frozen_file_ >= 0);
    DCHECK(mapped_file_ >= 0);

Copied: branches/2020Q2/www/firefox/files/patch-bug1628567 (from r533209, head/www/firefox/files/patch-bug1628567)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/firefox/files/patch-bug1628567	Mon May  4 16:59:33 2020	(r533932, copy of r533209, head/www/firefox/files/patch-bug1628567)
@@ -0,0 +1,34 @@
+Don't pass --target when CC/CXX contains clang
+
+--- third_party/rust/cc/src/lib.rs.orig	2020-04-10 00:57:23 UTC
++++ third_party/rust/cc/src/lib.rs
+@@ -2344,28 +2344,7 @@ impl Tool {
+     }
+ 
+     fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
+-        // Try to detect family of the tool from its name, falling back to Gnu.
+-        let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
+-            if fname.contains("clang-cl") {
+-                ToolFamily::Msvc { clang_cl: true }
+-            } else if fname.contains("cl")
+-                && !fname.contains("cloudabi")
+-                && !fname.contains("uclibc")
+-                && !fname.contains("clang")
+-            {
+-                ToolFamily::Msvc { clang_cl: false }
+-            } else if fname.contains("clang") {
+-                match clang_driver {
+-                    Some("cl") => ToolFamily::Msvc { clang_cl: true },
+-                    _ => ToolFamily::Clang,
+-                }
+-            } else {
+-                ToolFamily::Gnu
+-            }
+-        } else {
+-            ToolFamily::Gnu
+-        };
+-
++        let family = ToolFamily::Gnu;
+         Tool {
+             path: path,
+             cc_wrapper_path: None,

Modified: branches/2020Q2/www/firefox/files/patch-bug847568
==============================================================================
--- branches/2020Q2/www/firefox/files/patch-bug847568	Mon May  4 16:56:44 2020	(r533931)
+++ branches/2020Q2/www/firefox/files/patch-bug847568	Mon May  4 16:59:33 2020	(r533932)
@@ -227,7 +227,7 @@ index 95a58b634593..b614eef85c89 100644
 +                               * 100 + GR2_VERSION_BUGFIX >= \
 +                               (major) * 10000 + (minor) * 100 + (bugfix) )
 +                   ], [
-+                     #if !GR2_VERSION_REQUIRE(1,3,13)
++                     #if !GR2_VERSION_REQUIRE(1,3,14)
 +                     #error "Insufficient graphite2 version."
 +                     #endif
 +                   ], [],

More information about the svn-ports-all mailing list