Date: Tue, 4 Feb 2020 00:39:23 +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: r525108 - in head: Mk www/firefox www/firefox/files Message-ID: <202002040039.0140dNn6059652@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Feb 4 00:39:23 2020 New Revision: 525108 URL: https://svnweb.freebsd.org/changeset/ports/525108 Log: www/firefox: update to 73.0 Changes: https://www.mozilla.org/firefox/73.0/releasenotes/ PR: 243295 Security: 802e3138-b8af-4a89-a908-f103107e64b4 Differential Revision: https://reviews.freebsd.org/D23146 Deleted: head/www/firefox/files/patch-bug1556301 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) head/www/firefox/files/patch-bug847568 (contents, props changed) head/www/firefox/files/patch-cubeb-sndio (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Feb 4 00:39:10 2020 (r525107) +++ head/Mk/bsd.gecko.mk Tue Feb 4 00:39:23 2020 (r525108) @@ -76,8 +76,8 @@ LDFLAGS+= -Wl,--as-needed BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.8.7:devel/rust-cbindgen \ - ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ + rust-cbindgen>=0.12.0:devel/rust-cbindgen \ + ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ node:www/node MOZ_EXPORT+= ${CONFIGURE_ENV} \ Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/Makefile Tue Feb 4 00:39:23 2020 (r525108) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 72.0.2 -PORTREVISION= 2 +DISTVERSION= 73.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -14,7 +13,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.24:devel/nspr \ - nss>=3.48:security/nss \ + nss>=3.49.2:security/nss \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.4:print/harfbuzz \ Modified: head/www/firefox/distinfo ============================================================================== --- head/www/firefox/distinfo Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/distinfo Tue Feb 4 00:39:23 2020 (r525108) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579296956 -SHA256 (firefox-72.0.2.source.tar.xz) = 77fd224bea885172d757aef587ad443f2171aa84e4297bca55df91a1951be389 -SIZE (firefox-72.0.2.source.tar.xz) = 315848856 +TIMESTAMP = 1580774748 +SHA256 (firefox-73.0.source.tar.xz) = dd75ccc68b66f784fdb28716318262b25a7dfa548361b5518972693a951f81ec +SIZE (firefox-73.0.source.tar.xz) = 320194492 Modified: head/www/firefox/files/patch-addon-search ============================================================================== --- head/www/firefox/files/patch-addon-search Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/files/patch-addon-search Tue Feb 4 00:39:23 2020 (r525108) @@ -5,18 +5,18 @@ diff --git browser/app/profile/firefox.js browser/app/ index 75c2c5e435e35..4d8c09c02759b 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js -@@ -45,8 +45,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru +@@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru + // 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.compatOverides.url", "https://services.addons.mozilla.org/api/v3/addons/compat-override/?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.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox"); - -@@ -186,8 +186,8 @@ pref("app.update.service.enabled", true); + 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 // .. etc .. // pref("extensions.update.enabled", true); @@ -26,7 +26,7 @@ index 75c2c5e435e35..4d8c09c02759b 100644 +pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day - // Non-symmetric (not shared by extensions) extension-specific [update] preferences + diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm index f70fd8d7e3bd8..81e8cd7764fdf 100644 --- toolkit/mozapps/extensions/internal/AddonRepository.jsm Modified: head/www/firefox/files/patch-bug1288587 ============================================================================== --- head/www/firefox/files/patch-bug1288587 Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/files/patch-bug1288587 Tue Feb 4 00:39:23 2020 (r525108) @@ -2,30 +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 -@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter') - # ============================================================== - @depends('PYTHON', check_build_environment, mozconfig, '--help') - @imports('os') - @imports('sys') - @imports('subprocess') - @imports(_from='mozbuild.configure.util', _import='LineIO') +@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') @imports(_from='mozbuild.virtualenv', _import='verify_python_version') + @imports(_from='mozbuild.virtualenv', _import='PY2') +@imports(_from='__builtin__', _import='KeyError') - @imports('distutils.sysconfig') - def virtualenv_python(env_python, build_env, mozconfig, help): + def virtualenv_python2(env_python, build_env, mozconfig, help): if help: return - - python = env_python[0] if env_python else None - - # Ideally we'd rely on the mozconfig injection from mozconfig_options, -@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help): - if 'PYTHON' in mozconfig['env']['added']: - python = mozconfig['env']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['env']['modified']: - python = mozconfig['env']['modified']['PYTHON'][1] - elif 'PYTHON' in mozconfig['vars']['added']: +@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi python = mozconfig['vars']['added']['PYTHON'] elif 'PYTHON' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON'][1] @@ -36,32 +21,50 @@ index 855214a..1e91d51 100644 + except KeyError: + pass - with LineIO(lambda l: log.error(l)) as out: - verify_python_version(out) - topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir - if topobjdir.endswith('/js/src'): - topobjdir = topobjdir[:-7] + log.debug("python2: executable from configuration: %r" % python) - with LineIO(lambda l: log.info(l)) as out: -@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig - log.info('Creating Python environment') - manager.build(python) +@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi + 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)) +@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre + @imports(_from='mozbuild.virtualenv', _import='PY3') + @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') + @imports(_from='mozbuild.pythonutil', _import='python_executable_version') ++@imports(_from='__builtin__', _import='KeyError') + def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): + if help: + return +@@ -465,6 +476,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] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON3'] ++ except KeyError: ++ pass - python = normsep(manager.python_path) + log.debug("python3: executable from configuration: %r" % python) - if not normsep(sys.executable).startswith(normsep(virtualenvs_root)): - 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)) - - # We are now in the virtualenv - if not distutils.sysconfig.get_python_lib(): - die('Could not determine python site packages directory') - +@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab + 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 + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) Modified: head/www/firefox/files/patch-bug847568 ============================================================================== --- head/www/firefox/files/patch-bug847568 Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/files/patch-bug847568 Tue Feb 4 00:39:23 2020 (r525108) @@ -43,7 +43,7 @@ new file mode 100644 index 0000000000000..24e8d7a03274a --- /dev/null +++ gfx/graphite2/geckoextra/moz.build -@@ -0,0 +1,20 @@ +@@ -0,0 +1,21 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public @@ -52,6 +52,7 @@ index 0000000000000..24e8d7a03274a + +EXPORTS.graphite2 += [ + 'include/GraphiteExtra.h', ++ 'include/GraphiteStructsForRLBox.h', +] + +UNIFIED_SOURCES += [ @@ -226,7 +227,7 @@ index 95a58b634593..b614eef85c89 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,12) ++ #if !GR2_VERSION_REQUIRE(1,3,13) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -277,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.2', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.4', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) Modified: head/www/firefox/files/patch-cubeb-sndio ============================================================================== --- head/www/firefox/files/patch-cubeb-sndio Tue Feb 4 00:39:10 2020 (r525107) +++ head/www/firefox/files/patch-cubeb-sndio Tue Feb 4 00:39:23 2020 (r525108) @@ -1,113 +1,15 @@ -https://github.com/kinetiknz/cubeb/commit/a71f116501fe39962599c435ef65066f7e7ea9f5 -https://github.com/kinetiknz/cubeb/commit/3025cbec70f3ed097ec9a2f33a4823316a29efc4 -https://github.com/kinetiknz/cubeb/commit/bb2735fa2ff680fdc615edbb363b19ff4a759503 -https://github.com/kinetiknz/cubeb/pull/564 +https://github.com/kinetiknz/cubeb/commit/3ab507569153 diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c index 4a05bd84..34b3513d 100644 --- media/libcubeb/src/cubeb_sndio.c +++ media/libcubeb/src/cubeb_sndio.c -@@ -32,6 +32,7 @@ - X(sio_eof) \ - X(sio_getpar) \ - X(sio_initpar) \ -+ X(sio_nfds) \ - X(sio_onmove) \ - X(sio_open) \ - X(sio_pollfd) \ -@@ -124,6 +125,23 @@ s16_to_float(void *ptr, long nsamp) - *(--dst) = (1. / 32768) * *(--src); - } - -+static const char * -+sndio_get_device() -+{ -+#ifdef __linux__ -+ /* -+ * On other platforms default to sndio devices, -+ * so cubebs other backends can be used instead. -+ */ -+ const char *dev = getenv("AUDIODEVICE"); -+ if (dev == NULL || *dev == '\0') -+ return "snd/0"; -+ return dev; -+#else -+ return SIO_DEVANY; -+#endif -+} -+ - static void - sndio_onmove(void *arg, int delta) +@@ -128,7 +128,7 @@ s16_to_float(void *ptr, long nsamp) + static const char * + sndio_get_device() { -@@ -135,18 +153,23 @@ sndio_onmove(void *arg, int delta) - static void * - sndio_mainloop(void *arg) - { --#define MAXFDS 8 -- struct pollfd pfds[MAXFDS]; -+ struct pollfd *pfds; - cubeb_stream *s = arg; - int n, eof = 0, prime, nfds, events, revents, state = CUBEB_STATE_STARTED; - size_t pstart = 0, pend = 0, rstart = 0, rend = 0; - long nfr; - -+ nfds = WRAP(sio_nfds)(s->hdl); -+ pfds = calloc(nfds, sizeof (struct pollfd)); -+ if (pfds == NULL) -+ return NULL; -+ - DPR("sndio_mainloop()\n"); - s->state_cb(s, s->arg, CUBEB_STATE_STARTED); - pthread_mutex_lock(&s->mtx); - if (!WRAP(sio_start)(s->hdl)) { - pthread_mutex_unlock(&s->mtx); -+ free(pfds); - return NULL; - } - DPR("sndio_mainloop(), started\n"); -@@ -274,6 +297,7 @@ sndio_mainloop(void *arg) - s->hwpos = s->swpos; - pthread_mutex_unlock(&s->mtx); - s->state_cb(s, s->arg, state); -+ free(pfds); - return NULL; - } - -@@ -281,6 +305,9 @@ sndio_mainloop(void *arg) - sndio_init(cubeb **context, char const *context_name) - { - void * libsndio = NULL; -+ struct sio_hdl *hdl; -+ -+ assert(context); - - #ifndef DISABLE_LIBSNDIO_DLOPEN - libsndio = dlopen("libsndio.so.7.0", RTLD_LAZY); -@@ -305,8 +332,17 @@ sndio_init(cubeb **context, char const *context_name) - #undef LOAD - #endif - -+ /* test if sndio works */ -+ hdl = WRAP(sio_open)(sndio_get_device(), SIO_PLAY, 1); -+ if (hdl == NULL) { -+ return CUBEB_ERROR; -+ } -+ WRAP(sio_close)(hdl); -+ - DPR("sndio_init(%s)\n", context_name); -- *context = malloc(sizeof(*context)); -+ *context = malloc(sizeof(**context)); -+ if (*context == NULL) -+ return CUBEB_ERROR; - (*context)->libsndio = libsndio; - (*context)->ops = &sndio_ops; - (void)context_name; -@@ -377,7 +413,7 @@ sndio_stream_init(cubeb * context, - goto err; - } - s->context = context; -- s->hdl = WRAP(sio_open)(NULL, s->mode, 1); -+ s->hdl = WRAP(sio_open)(sndio_get_device(), s->mode, 1); - if (s->hdl == NULL) { - DPR("sndio_stream_init(), sio_open() failed\n"); - goto err; +-#ifndef __OpenBSD__ ++#ifdef __linux__ + /* + * On other platforms default to sndio devices, + * so cubebs other backends can be used instead.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002040039.0140dNn6059652>