git: faf598422165 - 2022Q2 - www/firefox: update to 100.0 (rc1)

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Tue, 26 Apr 2022 08:50:32 UTC
The branch 2022Q2 has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=faf5984221654362b96a58a370a71c3115f1fdf6

commit faf5984221654362b96a58a370a71c3115f1fdf6
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-04-26 08:48:18 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-04-26 08:50:07 +0000

    www/firefox: update to 100.0 (rc1)
    
    Release Notes (soon):
      https://www.mozilla.org/en-US/firefox/100.0/releasenotes/
    
    (cherry picked from commit c4e707ffec2f82836b79e7312da5a5228edbb6dd)
---
 www/firefox/Makefile               |  6 +++---
 www/firefox/distinfo               |  6 +++---
 www/firefox/files/patch-bug1664115 | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ab713a16dfa7..fcbe0e76efe8 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,11 +1,11 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 
 PORTNAME=	firefox
-DISTVERSION=	99.0.1
+DISTVERSION=	100.0
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.76:security/nss \
 		icu>=70.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
-		harfbuzz>=3.4.0:print/harfbuzz \
+		harfbuzz>=4.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.37:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index f16ba01741f6..851ed830f08c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649763203
-SHA256 (firefox-99.0.1.source.tar.xz) = 76d22279ce99588a728bb2d034064be0d5918b5900631f2148d4565b8a72e00b
-SIZE (firefox-99.0.1.source.tar.xz) = 483537764
+TIMESTAMP = 1650958415
+SHA256 (firefox-100.0.source.tar.xz) = fba937a55a177916c6121f82f79e0d46c10bf175d4effc10d9095d0c297711fa
+SIZE (firefox-100.0.source.tar.xz) = 482628448
diff --git a/www/firefox/files/patch-bug1664115 b/www/firefox/files/patch-bug1664115
index dce342a44b40..3be934a8c04e 100644
--- a/www/firefox/files/patch-bug1664115
+++ b/www/firefox/files/patch-bug1664115
@@ -3,8 +3,8 @@ 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.
 
---- dom/media/AudioStream.cpp.orig	2022-02-25 16:27:47.676236000 +0100
-+++ dom/media/AudioStream.cpp	2022-02-25 16:54:21.223904000 +0100
+--- dom/media/AudioStream.cpp.orig	2022-04-19 19:43:36.505544000 +0200
++++ dom/media/AudioStream.cpp	2022-04-19 19:47:53.111474000 +0200
 @@ -27,7 +27,6 @@
  #endif
  #include "Tracing.h"
@@ -14,7 +14,7 @@ created by libcubeb.
  
  // Use abort() instead of exception in SoundTouch.
 @@ -144,8 +143,6 @@
-       mAudioClock(aInRate),
+       mOutChannels(aOutputChannels),
        mState(INITIALIZED),
        mDataSource(aSource),
 -      mAudioThreadId(ProfilerThreadId{}),
@@ -22,7 +22,7 @@ created by libcubeb.
        mPlaybackComplete(false),
        mPlaybackRate(1.0f),
        mPreservesPitch(true) {}
-@@ -551,17 +548,6 @@
+@@ -552,17 +549,6 @@
        aWriter.Available());
  }
  
@@ -40,7 +40,7 @@ created by libcubeb.
  void AudioStream::AssertIsOnAudioThread() const {
    // This can be called right after CheckThreadIdChanged, because the audio
    // thread can change when not sandboxed.
-@@ -590,9 +576,6 @@
+@@ -591,9 +577,6 @@
  }
  
  long AudioStream::DataCallback(void* aBuffer, long aFrames) {
@@ -50,7 +50,7 @@ created by libcubeb.
    WebCore::DenormalDisabler disabler;
  
    TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate());
-@@ -647,9 +630,6 @@
+@@ -648,9 +631,6 @@
    mDumpFile.Write(static_cast<const AudioDataValue*>(aBuffer),
                    aFrames * mOutChannels);
  
@@ -60,17 +60,17 @@ created by libcubeb.
    return aFrames - writer.Available();
  }
  
---- dom/media/AudioStream.h.orig	2022-02-25 16:27:53.316210000 +0100
-+++ dom/media/AudioStream.h	2022-02-25 16:55:18.967535000 +0100
-@@ -323,7 +323,6 @@
+--- dom/media/AudioStream.h.orig	2022-04-19 19:43:45.457171000 +0200
++++ dom/media/AudioStream.h	2022-04-19 19:45:30.463633000 +0200
+@@ -329,7 +329,6 @@
  
    template <typename Function, typename... Args>
-   int InvokeCubeb(Function aFunction, Args&&... aArgs);
+   int InvokeCubeb(Function aFunction, Args&&... aArgs) REQUIRES(mMonitor);
 -  bool CheckThreadIdChanged();
    void AssertIsOnAudioThread() const;
  
    soundtouch::SoundTouch* mTimeStretcher;
-@@ -357,9 +356,6 @@
+@@ -368,9 +367,6 @@
    // the default device is used. It is set
    // during the Init() in decoder thread.
    RefPtr<AudioDeviceInfo> mSinkInfo;
@@ -78,5 +78,5 @@ created by libcubeb.
 -  std::atomic<ProfilerThreadId> mAudioThreadId;
 -  const bool mSandboxed = false;
  
-   MozPromiseHolder<MediaSink::EndedPromise> mEndedPromise;
+   MozPromiseHolder<MediaSink::EndedPromise> mEndedPromise GUARDED_BY(mMonitor);
    std::atomic<bool> mPlaybackComplete;