Date: Tue, 23 Jun 2020 11:48:39 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539972 - in head: Mk www/firefox www/firefox/files Message-ID: <202006231148.05NBmd2q076597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jun 23 11:48:39 2020 New Revision: 539972 URL: https://svnweb.freebsd.org/changeset/ports/539972 Log: www/firefox: update to 78.0 Changes: https://www.mozilla.org/firefox/78.0/releasenotes/ PR: 247329 Differential Revision: https://reviews.freebsd.org/D25301 Deleted: head/www/firefox/files/patch-bug1632456 head/www/firefox/files/patch-bug1634852 head/www/firefox/files/patch-bug1636072 head/www/firefox/files/patch-bug1638010 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-bug1288587 (contents, props changed) head/www/firefox/files/patch-bug1618914 (contents, props changed) head/www/firefox/files/patch-bug847568 (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Jun 23 10:18:31 2020 (r539971) +++ head/Mk/bsd.gecko.mk Tue Jun 23 11:48:39 2020 (r539972) @@ -77,7 +77,7 @@ BINARY_ALIAS+= python3=python${PYTHON3_DEFAULT} BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.13.1:devel/rust-cbindgen \ + rust-cbindgen>=0.14.1:devel/rust-cbindgen \ ${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ node:www/node Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Jun 23 10:18:31 2020 (r539971) +++ head/www/firefox/Makefile Tue Jun 23 11:48:39 2020 (r539972) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 77.0.1 -PORTREVISION= 1 +DISTVERSION= 78.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -14,10 +13,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.25:devel/nspr \ - nss>=3.52.1:security/nss \ - icu>=64.1,1:devel/icu \ + nss>=3.53.1:security/nss \ + icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.6.4:print/harfbuzz \ + harfbuzz>=2.6.6:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ Modified: head/www/firefox/distinfo ============================================================================== --- head/www/firefox/distinfo Tue Jun 23 10:18:31 2020 (r539971) +++ head/www/firefox/distinfo Tue Jun 23 11:48:39 2020 (r539972) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591146315 -SHA256 (firefox-77.0.1.source.tar.xz) = 54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640 -SIZE (firefox-77.0.1.source.tar.xz) = 334037816 +TIMESTAMP = 1592878264 +SHA256 (firefox-78.0.source.tar.xz) = 97770b3277adde8baa3fe1feaac7c54caae3bb1d923bc8e680c30c7d171da1ef +SIZE (firefox-78.0.source.tar.xz) = 331612656 Modified: head/www/firefox/files/patch-bug1288587 ============================================================================== --- head/www/firefox/files/patch-bug1288587 Tue Jun 23 10:18:31 2020 (r539971) +++ head/www/firefox/files/patch-bug1288587 Tue Jun 23 11:48:39 2020 (r539972) @@ -2,7 +2,7 @@ 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='PYTHON3', nargs=1, help='Python 3 interpre +@@ -251,6 +251,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') @@ -10,7 +10,7 @@ index 855214a..1e91d51 100644 def virtualenv_python3(env_python, build_env, mozconfig, help): # Avoid re-executing python when running configure --help. if help: -@@ -284,6 +285,12 @@ def virtualenv_python3(env_python, build_env, mozconfi +@@ -283,6 +284,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] @@ -23,15 +23,15 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -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: -- del os.environ['PYTHON3'] +@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi + sys.executable, manager.python_path)) + log.info('Re-executing in the virtualenv') + if env_python: +- del os.environ['PYTHON3'] + try: + del os.environ['PYTHON3'] + except KeyError: + pass - # 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. + # 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: head/www/firefox/files/patch-bug1618914 ============================================================================== --- head/www/firefox/files/patch-bug1618914 Tue Jun 23 10:18:31 2020 (r539971) +++ head/www/firefox/files/patch-bug1618914 Tue Jun 23 11:48:39 2020 (r539972) @@ -4,8 +4,7 @@ diff --git widget/gtk/WindowSurfaceWayland.cpp widget/ index 9a73326399bd5..9e42a7f1c5d18 100644 --- widget/gtk/WindowSurfaceWayland.cpp +++ widget/gtk/WindowSurfaceWayland.cpp -@@ -235,23 +235,24 @@ - #ifdef HAVE_POSIX_FALLOCATE +@@ -222,19 +222,20 @@ static int WaylandAllocateShmMemory(int aSize) { do { ret = posix_fallocate(fd, 0, aSize); } while (ret == EINTR); @@ -14,9 +13,7 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 + return fd; + } else if (ret != EINVAL && ret != EOPNOTSUPP) { close(fd); - MOZ_CRASH_UNSAFE_PRINTF( - "posix_fallocate() fails on %s size %d error code %d\n", filename, - aSize, ret); + MOZ_CRASH("posix_fallocate() fails to allocate shm memory"); } -#else +#endif @@ -25,8 +22,7 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 } while (ret < 0 && errno == EINTR); if (ret < 0) { close(fd); - MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n", - filename, aSize, ret); + MOZ_CRASH("ftruncate() fails to allocate shm memory"); } -#endif Modified: head/www/firefox/files/patch-bug847568 ============================================================================== --- head/www/firefox/files/patch-bug847568 Tue Jun 23 10:18:31 2020 (r539971) +++ head/www/firefox/files/patch-bug847568 Tue Jun 23 11:48:39 2020 (r539972) @@ -278,7 +278,7 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.4', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.6', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006231148.05NBmd2q076597>