From 64b874d99cdb3f376918e336ca38209cd5e80159 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Mon, 22 Mar 2021 13:10:04 +0000 Subject: [PATCH] MFH: r568897 r568900 update firefox to 87.0 Release Notes (soon): https://www.mozilla.org/en-US/firefox/87.0/releasenotes/ www/firefox: bump minimum dependencies after r568897 --- Mk/bsd.gecko.mk | 2 +- www/firefox/Makefile | 6 +++--- www/firefox/distinfo | 6 +++--- www/firefox/files/patch-bug1664115 | 34 +++++++++++++----------------- www/firefox/files/patch-bug847568 | 2 +- 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index b58e697c52a9..7470496865b4 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -77,7 +77,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD} BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.15.0:devel/rust-cbindgen \ + rust-cbindgen>=0.16.0:devel/rust-cbindgen \ ${RUST_DEFAULT}>=1.43:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ad84b453da9a..daa9bd24a270 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 86.0.1 +DISTVERSION= 87.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,10 +13,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ - nss>=3.58:security/nss \ + nss>=3.62:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.6.8:print/harfbuzz \ + harfbuzz>=2.7.4:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index b04cec4accd7..35782e402fed 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615464256 -SHA256 (firefox-86.0.1.source.tar.xz) = 74f99c226ae6747f0170566f4f88be410866b0120214d2a593566cd1fff3d3df -SIZE (firefox-86.0.1.source.tar.xz) = 369541992 +TIMESTAMP = 1616281703 +SHA256 (firefox-87.0.source.tar.xz) = ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab +SIZE (firefox-87.0.source.tar.xz) = 377285124 diff --git a/www/firefox/files/patch-bug1664115 b/www/firefox/files/patch-bug1664115 index 6672aa67459d..05bc6a15e35f 100644 --- a/www/firefox/files/patch-bug1664115 +++ b/www/firefox/files/patch-bug1664115 @@ -3,11 +3,9 @@ using any cubeb backends other than pulse-rust to play media. The loss of such change will be that users will not be able to do profiling on threads created by libcubeb. -diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 1b62a26ab32b2..35c61f612bf72 100644 ---- dom/media/AudioStream.cpp -+++ dom/media/AudioStream.cpp -@@ -25,7 +25,6 @@ +--- dom/media/AudioStream.cpp.orig 2021-03-20 22:57:21.194862000 +0100 ++++ dom/media/AudioStream.cpp 2021-03-20 23:00:50.527112000 +0100 +@@ -26,7 +26,6 @@ #endif #include "Tracing.h" #include "webaudio/blink/DenormalDisabler.h" @@ -15,18 +13,18 @@ index 1b62a26ab32b2..35c61f612bf72 100644 // Use abort() instead of exception in SoundTouch. #define ST_NO_EXCEPTION_HANDLING 1 -@@ -138,9 +137,7 @@ +@@ -139,9 +138,7 @@ mTimeStretcher(nullptr), mState(INITIALIZED), mDataSource(aSource), - mPrefillQuirk(false), - mAudioThreadId(0), -- mSandboxed(CubebUtils::SandboxEnabled()) { -+ mPrefillQuirk(false) { - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Register(this); -@@ -587,21 +584,7 @@ +- mSandboxed(CubebUtils::SandboxEnabled()) {} ++ mPrefillQuirk(false) {} + + AudioStream::~AudioStream() { + LOG("deleted, state %d", mState); +@@ -565,21 +562,7 @@ aWriter.Available()); } @@ -48,7 +46,7 @@ index 1b62a26ab32b2..35c61f612bf72 100644 WebCore::DenormalDisabler disabler; TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate()); -@@ -657,9 +640,6 @@ +@@ -635,9 +618,6 @@ mDumpFile.Write(static_cast(aBuffer), aFrames * mOutChannels); @@ -58,11 +56,9 @@ index 1b62a26ab32b2..35c61f612bf72 100644 return aFrames - writer.Available(); } -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 933e4cb3bfdb5..5d2181e632af9 100644 ---- dom/media/AudioStream.h -+++ dom/media/AudioStream.h -@@ -307,7 +307,6 @@ class AudioStream final +--- dom/media/AudioStream.h.orig 2021-03-20 23:01:10.169773000 +0100 ++++ dom/media/AudioStream.h 2021-03-20 23:01:56.622691000 +0100 +@@ -294,7 +294,6 @@ template int InvokeCubeb(Function aFunction, Args&&... aArgs); @@ -70,7 +66,7 @@ index 933e4cb3bfdb5..5d2181e632af9 100644 // The monitor is held to protect all access to member variables. Monitor mMonitor; -@@ -341,9 +340,6 @@ class AudioStream final +@@ -328,9 +327,6 @@ // the default device is used. It is set // during the Init() in decoder thread. RefPtr mSinkInfo; diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index f1a005b360b6..3f688427b494 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -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.8", ++system_harfbuzz = pkg_check_modules("MOZ_HARFBUZZ", "harfbuzz >= 2.7.4", + when="--with-system-harfbuzz") + +set_config("MOZ_SYSTEM_HARFBUZZ", depends_if(system_harfbuzz)(lambda _: True))