Skip to content

Commit

Permalink
Firefox 99.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfgang Rosenauer committed Apr 19, 2022
1 parent e6a7a8e commit 081e705
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 54 deletions.
12 changes: 3 additions & 9 deletions firefox/MozillaFirefox.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
# orig_suffix b3
# major 69
# mainver %major.99
%define major 97
%define major 99
%define mainver %major.0.1
%define orig_version 97.0.1
%define orig_version 99.0.1
%define orig_suffix %{nil}
%define update_channel release
%define branding 1
Expand Down Expand Up @@ -114,7 +114,7 @@ BuildRequires: libiw-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.33
BuildRequires: mozilla-nss-devel >= 3.74
BuildRequires: mozilla-nss-devel >= 3.76.1
BuildRequires: nasm >= 2.14
BuildRequires: nodejs >= 10.22.1
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
Expand Down Expand Up @@ -685,12 +685,6 @@ FIN
%fdupes %{buildroot}%{progdir}
%fdupes %{buildroot}%{_datadir}

%clean
rm -rf %{buildroot}
%if %localize
rm -rf %{_tmppath}/translations.*
%endif

%post
# update mime and desktop database
%mime_database_post
Expand Down
13 changes: 13 additions & 0 deletions firefox/_constraints
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<size unit="G">15</size>
</physicalmemory>
</hardware>
<hostlabel exclude="true">SLOW_CPU</hostlabel>
<overwrite>
<conditions>
<arch>armv6l</arch>
Expand All @@ -27,6 +28,18 @@
<overwrite>
<conditions>
<arch>aarch64</arch>
</conditions>
<hardware>
<cpu>
<flag>asimdrdm</flag>
</cpu>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>ppc64le</arch>
<arch>s390x</arch>
</conditions>
Expand Down
8 changes: 4 additions & 4 deletions firefox/tar_stamps
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRODUCT="firefox"
CHANNEL="release"
VERSION="97.0.1"
VERSION="99.0.1"
VERSION_SUFFIX=""
PREV_VERSION="97.0"
PREV_VERSION="99.0"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
RELEASE_TAG="0f0ba6e8029d8148743c4aa50c2be4c4c643f8a4"
RELEASE_TIMESTAMP="20220216172458"
RELEASE_TAG="0f814a8ab240bb6df6bbc5a88865f979e03f0f68"
RELEASE_TIMESTAMP="20220411174855"
7 changes: 5 additions & 2 deletions mozilla-kde.patch
Original file line number Diff line number Diff line change
Expand Up @@ -941,12 +941,13 @@ diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/
new file mode 100644
--- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
@@ -0,0 +1,86 @@
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/StaticPrefs_browser.h"
+#include "nsKDERegistry.h"
+#include "prlink.h"
+#include "prmem.h"
Expand Down Expand Up @@ -1022,8 +1023,10 @@ new file mode 100644
+ nsCString description = output[ 1 ];
+ mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description));
+ nsCString handlerAppName = output[ 2 ];
+ mozilla::StaticPrefs::browser_download_improvements_to_download_panel()
+ ? mimeInfo->SetPreferredAction(nsIMIMEInfo::saveToDisk)
+ : mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
+ mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName));
+ mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
+ return mimeInfo.forget();
+ }
+ return nullptr;
Expand Down
15 changes: 3 additions & 12 deletions mozilla-libavcodec58_91.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
# HG changeset patch
# Parent e4abeadbbb7a0c63c17177f1d14ea04c77c6128e
# Parent 3802b7b2b99885f3ad4d2ec3e2c157e38d04a168

diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
--- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -22,23 +22,27 @@ class FFmpegDecoderModule {
static already_AddRefed<PlatformDecoderModule> Create(FFmpegLibWrapper*);
};

static FFmpegLibWrapper sLibAV;

static const char* sLibs[] = {
// clang-format off
#if defined(XP_DARWIN)
+ "libavcodec.58.134.dylib",
+ "libavcodec.58.91.dylib",
@@ -31,16 +31,18 @@ static const char* sLibs[] = {
"libavcodec.58.dylib",
"libavcodec.57.dylib",
"libavcodec.56.dylib",
"libavcodec.55.dylib",
"libavcodec.54.dylib",
"libavcodec.53.dylib",
#else
"libavcodec.so.59",
+ "libavcodec.so.58.134",
+ "libavcodec.so.58.91",
"libavcodec.so.58",
Expand Down
18 changes: 9 additions & 9 deletions mozilla-pgo.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent ebd7e379c85889b6f8dba0542479110ab1f6b059
# Parent 02ffee15578fd4dc2dd5ade32e7dab907d633b0d

diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
--- a/build/moz.configure/lto-pgo.configure
+++ b/build/moz.configure/lto-pgo.configure
@@ -243,34 +243,34 @@ def lto(
@@ -242,34 +242,34 @@ def lto(
"configure."
)

Expand Down Expand Up @@ -181,10 +181,10 @@ diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components
+ crashAfterMS = INT32_MAX;
+
UniquePtr<Options> options(new Options());
const PRIntervalTime ticksDuration =
PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
options->crashAfterTicks = crashAfterMS / ticksDuration;
// Handle systems where ticksDuration is greater than crashAfterMS.
if (options->crashAfterTicks == 0) {
options->crashAfterTicks = crashAfterMS / HEARTBEAT_INTERVAL_MS;
}
// crashAfterTicks is guaranteed to be > 0 as
// crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
options->crashAfterTicks = crashAfterMS / HEARTBEAT_INTERVAL_MS;

DebugOnly<PRThread*> watchdogThread =
CreateSystemThread(RunWatchdog, options.release());
MOZ_ASSERT(watchdogThread);
28 changes: 14 additions & 14 deletions mozilla-s390-context.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
# Date 1558452408 -7200
# Tue May 21 17:26:48 2019 +0200
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
# Parent 60715122a04aad06b33ad7259f1bde19803230da
# Parent 136e1f2c44a3099b3e49a576fa62c8ad77aa431e
[mq]: mozilla-s390-context.patch

diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -151,16 +151,20 @@ using mozilla::DebugOnly;
# define FP_sig(p) ((p)->uc_mcontext.mc_fp)
# define SP_sig(p) ((p)->uc_mcontext.mc_i7)
# endif
# if defined(__linux__) && (defined(__ppc64__) || defined(__PPC64__) || \
defined(__ppc64le__) || defined(__PPC64LE__))
# define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
# endif
# if defined(__linux__) && defined(__loongarch__)
# define EPC_sig(p) ((p)->uc_mcontext.pc)
# define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
# define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
# define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
# endif
+# if defined(__linux__) && defined(__s390x__)
+# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
+# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
Expand All @@ -30,15 +30,15 @@ diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers
# define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
# define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
# define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
@@ -371,16 +375,20 @@ struct macos_aarch64_context {
# define FP_sig(p) RFP_sig(p)
# define SP_sig(p) RSP_sig(p)
# define LR_sig(p) R31_sig(p)
# elif defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
defined(__PPC64LE__)
@@ -399,16 +403,20 @@ struct macos_aarch64_context {
# define PC_sig(p) R32_sig(p)
# define SP_sig(p) R01_sig(p)
# define FP_sig(p) R01_sig(p)
# elif defined(__loongarch__)
# define PC_sig(p) EPC_sig(p)
# define FP_sig(p) RFP_sig(p)
# define SP_sig(p) RSP_sig(p)
# define LR_sig(p) RRA_sig(p)
+# elif defined(__s390x__)
+# define PC_sig(p) PSWa_sig(p)
+# define SP_sig(p) GR_sig(p, 15)
Expand Down
8 changes: 4 additions & 4 deletions mozilla-silence-no-return-type.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# HG changeset patch
# Parent 216843712d6d6cd9d5bd519f6ef564d00406b43f
# Parent 1191efd2ea64c4081a1825176a50e872a525d4da

diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2165,18 +2165,16 @@ name = "glsl-to-cxx"
@@ -2196,18 +2196,16 @@ name = "glsl-to-cxx"
version = "0.1.0"
dependencies = [
"glsl",
Expand All @@ -26,8 +26,8 @@ diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,13 +102,13 @@ moz_asserts = { path = "mozglue/static/r
# Other overrides
@@ -106,13 +106,13 @@ moz_asserts = { path = "mozglue/static/r
async-task = { git = "https://github.com/smol-rs/async-task", rev="f6488e35beccb26eb6e85847b02aa78a42cd3d0e" }
chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" }
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" }
Expand Down

0 comments on commit 081e705

Please sign in to comment.