From owner-svn-ports-all@freebsd.org Mon Jun 1 23:22:45 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1A4A2F587C; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bWRn3mqmz44kY; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 633DB1367B; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051NMjgp059067; Mon, 1 Jun 2020 23:22:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051NMh3m059059; Mon, 1 Jun 2020 23:22:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006012322.051NMh3m059059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 1 Jun 2020 23:22:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537512 - in branches/2020Q2: Mk www/firefox www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2: Mk www/firefox www/firefox/files X-SVN-Commit-Revision: 537512 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 23:22:45 -0000 Author: jbeich Date: Mon Jun 1 23:22:43 2020 New Revision: 537512 URL: https://svnweb.freebsd.org/changeset/ports/537512 Log: MFH: r536538 r536713 r537007 www/firefox: update to 77.0 Changes: https://www.mozilla.org/firefox/77.0/releasenotes/ Approved by: ports-secteam blanket Added: branches/2020Q2/www/firefox/files/patch-bug1632456 - copied unchanged from r536713, head/www/firefox/files/patch-bug1632456 branches/2020Q2/www/firefox/files/patch-bug1636072 - copied unchanged from r536713, head/www/firefox/files/patch-bug1636072 branches/2020Q2/www/firefox/files/patch-bug1638010 - copied unchanged from r536713, head/www/firefox/files/patch-bug1638010 Deleted: branches/2020Q2/www/firefox/files/patch-bug1624128 branches/2020Q2/www/firefox/files/patch-bug1625431 branches/2020Q2/www/firefox/files/patch-bug1628690 Modified: branches/2020Q2/Mk/bsd.gecko.mk branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/distinfo branches/2020Q2/www/firefox/files/patch-addon-search branches/2020Q2/www/firefox/files/patch-bug1288587 Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/Mk/bsd.gecko.mk ============================================================================== --- branches/2020Q2/Mk/bsd.gecko.mk Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/Mk/bsd.gecko.mk Mon Jun 1 23:22:43 2020 (r537512) @@ -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: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/Makefile Mon Jun 1 23:22:43 2020 (r537512) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 76.0.1 -PORTREVISION= 4 +DISTVERSION= 77.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q2/www/firefox/distinfo ============================================================================== --- branches/2020Q2/www/firefox/distinfo Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/distinfo Mon Jun 1 23:22:43 2020 (r537512) @@ -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 = 1590732186 +SHA256 (firefox-77.0.source.tar.xz) = b534794c493d8698dfb6c852af52b49540afdf88dc50451f42d6591de93291e8 +SIZE (firefox-77.0.source.tar.xz) = 329713656 Modified: branches/2020Q2/www/firefox/files/patch-addon-search ============================================================================== --- branches/2020Q2/www/firefox/files/patch-addon-search Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/files/patch-addon-search Mon Jun 1 23:22:43 2020 (r537512) @@ -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: branches/2020Q2/www/firefox/files/patch-bug1288587 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1288587 Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/files/patch-bug1288587 Mon Jun 1 23:22:43 2020 (r537512) @@ -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') -+@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') +@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: Copied: branches/2020Q2/www/firefox/files/patch-bug1632456 (from r536713, head/www/firefox/files/patch-bug1632456) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1632456 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1632456) @@ -0,0 +1,40 @@ +commit 0aaf67da2681 +Author: Martin Stransky +Date: Wed May 27 08:37:58 2020 +0000 + + Bug 1632456 [Wayland] Release mVAAPIDeviceContext when FFmpegVideoDecoder::CreateVAAPIDeviceContext() fails, r=jya + + Differential Revision: https://phabricator.services.mozilla.com/D76745 +--- + dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +index 889d1d1ed5b97..1bd144d7375f4 100644 +--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ++++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +@@ -175,6 +175,10 @@ bool FFmpegVideoDecoder::CreateVAAPIDeviceContext() { + if (!mVAAPIDeviceContext) { + return false; + } ++ ++ auto releaseVAAPIcontext = ++ MakeScopeExit([&] { mLib->av_buffer_unref(&mVAAPIDeviceContext); }); ++ + AVHWDeviceContext* hwctx = (AVHWDeviceContext*)mVAAPIDeviceContext->data; + AVVAAPIDeviceContext* vactx = (AVVAAPIDeviceContext*)hwctx->hwctx; + +@@ -195,12 +199,12 @@ bool FFmpegVideoDecoder::CreateVAAPIDeviceContext() { + } + + vactx->display = mDisplay; +- + if (mLib->av_hwdevice_ctx_init(mVAAPIDeviceContext) < 0) { + return false; + } + + mCodecContext->hw_device_ctx = mLib->av_buffer_ref(mVAAPIDeviceContext); ++ releaseVAAPIcontext.release(); + return true; + } + Copied: branches/2020Q2/www/firefox/files/patch-bug1636072 (from r536713, head/www/firefox/files/patch-bug1636072) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1636072 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1636072) @@ -0,0 +1,33 @@ +commit edbe69232a5b +Author: Martin Stransky +Date: Tue May 12 09:20:25 2020 +0000 + + Bug 1636072 [Wayland] Don't crash when GetWlBuffer() fails, r=jhorak + + Differential Revision: https://phabricator.services.mozilla.com/D74663 +--- + widget/gtk/WindowSurfaceWayland.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp +index 372158c9f0f33..56f5d3d530853 100644 +--- widget/gtk/WindowSurfaceWayland.cpp ++++ widget/gtk/WindowSurfaceWayland.cpp +@@ -390,10 +390,13 @@ void WindowBackBuffer::Attach(wl_surface* aSurface) { + (void*)GetWlBuffer(), + GetWlBuffer() ? wl_proxy_get_id((struct wl_proxy*)GetWlBuffer()) : -1)); + +- wl_surface_attach(aSurface, GetWlBuffer(), 0, 0); +- wl_surface_commit(aSurface); +- wl_display_flush(WaylandDisplayGetWLDisplay()); +- SetAttached(); ++ wl_buffer* buffer = GetWlBuffer(); ++ if (buffer) { ++ wl_surface_attach(aSurface, buffer, 0, 0); ++ wl_surface_commit(aSurface); ++ wl_display_flush(WaylandDisplayGetWLDisplay()); ++ SetAttached(); ++ } + } + + void WindowBackBufferShm::Detach(wl_buffer* aBuffer) { Copied: branches/2020Q2/www/firefox/files/patch-bug1638010 (from r536713, head/www/firefox/files/patch-bug1638010) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1638010 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1638010) @@ -0,0 +1,25 @@ +commit 9a89dccd2a85 +Author: Martin Stransky +Date: Fri May 15 07:52:39 2020 +0000 + + Bug 1638010 [Wayland] Make WaylandDMABUFTextureData::BorrowDrawTarget() fail when underlying dmabuf surface is not locked, r=sotaro + + Differential Revision: https://phabricator.services.mozilla.com/D75329 +--- + gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +index bb556d9fcfaf5..da9c9cb6f4d19 100644 +--- gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp ++++ gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +@@ -86,6 +86,9 @@ already_AddRefed WaylandDMABUFTextureData::BorrowDrawTarget() { + return nullptr; + } + auto surf = mSurface->GetAsWaylandDMABufSurfaceRGBA(); ++ if (!surf->GetMappedRegion()) { ++ return nullptr; ++ } + return Factory::CreateDrawTargetForData( + mBackend, (unsigned char*)surf->GetMappedRegion(), + IntSize(surf->GetWidth(), surf->GetHeight()),