--- a/MozillaFirefox/MozillaFirefox.spec Thu Dec 10 14:36:59 2020 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Dec 27 10:49:49 2020 +0100
@@ -29,9 +29,9 @@
# orig_suffix b3
# major 69
# mainver %major.99
-%define major 83
+%define major 84
%define mainver %major.0
-%define orig_version 83.0
+%define orig_version 84.0
%define orig_suffix %{nil}
%define update_channel release
%define branding 1
@@ -92,7 +92,7 @@
%else
BuildRequires: gcc-c++
%endif
-BuildRequires: cargo >= 1.43
+BuildRequires: cargo >= 1.44
BuildRequires: ccache
BuildRequires: libXcomposite-devel
BuildRequires: libcurl-devel
@@ -101,7 +101,7 @@
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.29
-BuildRequires: mozilla-nss-devel >= 3.58
+BuildRequires: mozilla-nss-devel >= 3.59
BuildRequires: nasm >= 2.14
BuildRequires: nodejs10 >= 10.22.1
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
@@ -111,8 +111,8 @@
BuildRequires: python3 >= 3.5
BuildRequires: python3-devel
%endif
-BuildRequires: rust >= 1.43
-BuildRequires: rust-cbindgen >= 0.14.3
+BuildRequires: rust >= 1.44
+BuildRequires: rust-cbindgen >= 0.15.0
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel
@@ -195,6 +195,7 @@
Patch7: mozilla-fix-aarch64-libopus.patch
Patch8: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch
Patch9: mozilla-s390-context.patch
+Patch10: mozilla-pgo.patch
Patch11: mozilla-reduce-rust-debuginfo.patch
Patch13: mozilla-bmo1005535.patch
Patch14: mozilla-bmo1568145.patch
@@ -212,7 +213,6 @@
Patch26: mozilla-bmo1626236.patch
Patch27: mozilla-s390x-skia-gradient.patch
Patch28: mozilla-libavcodec58_91.patch
-Patch29: revert-795c8762b16b.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@@ -335,6 +335,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%patch11 -p1
%patch13 -p1
%patch14 -p1
@@ -354,7 +355,6 @@
%patch26 -p1
%patch27 -p1
%patch28 -p1
-%patch29 -p1 -R
# Firefox
%patch101 -p1
%patch102 -p1
@@ -536,7 +536,6 @@
# build additional locales
%if %localize
-mkdir -p %{buildroot}%{progdir}/browser/extensions
truncate -s 0 %{_tmppath}/translations.{common,other}
# langpack-build can not be done in parallel easily (see https://bugzilla.mozilla.org/show_bug.cgi?id=1660943)
# Therefore, we have to have a separate obj-dir for each language
@@ -562,6 +561,7 @@
%else
%define njobs 0%{?jobs:%jobs}
%endif
+mkdir -p $RPM_BUILD_DIR/langpacks_artifacts/
sed -r '/^(ja-JP-mac|ga-IE|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \
| xargs -n 1 %{?njobs:-P %njobs} -I {} /bin/sh -c '
locale=$1
@@ -571,10 +571,7 @@
# nsinstall is needed for langpack-build. It is already built by `./mach build`, but building it again is very fast
./mach build config/nsinstall langpack-$locale
cp -L ../obj_$locale/dist/linux-*/xpi/firefox-%{orig_version}.$locale.langpack.xpi \
- %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org.xpi
- # remove prefs, profile defaults, and hyphenation from langpack
- #rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults
- #rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
+ $RPM_BUILD_DIR/langpacks_artifacts/langpack-$locale@firefox.mozilla.org.xpi
# check against the fixed common list and sort into the right filelist
_matched=0
for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
@@ -604,6 +601,8 @@
# copy tree into RPM_BUILD_ROOT
mkdir -p %{buildroot}%{progdir}
cp -rf $RPM_BUILD_DIR/obj/dist/%{srcname}/* %{buildroot}%{progdir}
+mkdir -p %{buildroot}%{progdir}/browser/extensions
+cp -rf $RPM_BUILD_DIR/langpacks_artifacts/* %{buildroot}%{progdir}/browser/extensions/
mkdir -p %{buildroot}%{progdir}/distribution/extensions
mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/
# renaming executables (for regular vs. ESR)