- Mozilla Firefox 91.0

MFSA 2021-?? (boo#1188891)
- requires
  * rustc/cargo >= 1.51
  * NSPR >= 4.32
  * NSS >= 3.68
- force-disable webrender on BE platforms

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=926

MozillaFirefox.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Aug  9 14:55:22 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Firefox 91.0
+  MFSA 2021-?? (boo#1188891)
+- requires
+  * rustc/cargo >= 1.51
+  * NSPR >= 4.32
+  * NSS >= 3.68
+- force-disable webrender on BE platforms
+
 -------------------------------------------------------------------
 Sat Jul 24 07:15:54 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 

MozillaFirefox.spec

@@ -32,9 +32,9 @@
 # orig_suffix b3
 # major 69
 # mainver %major.99
-%define major          90
+%define major          91
-%define mainver        %major.0.2
+%define mainver        %major.0
-%define orig_version   90.0.2
+%define orig_version   91.0
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
@@ -54,6 +54,9 @@
 # define if ccache should be used or not
 %define useccache     1
 
+# SLE-12 doesn't have this macro
+%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d}
+
 # Firefox only supports i686
 %ifarch %ix86
 ExclusiveArch:  i586 i686
@@ -100,7 +103,15 @@ BuildRequires:  gcc9-c++
 %else
 BuildRequires:  gcc-c++
 %endif
-BuildRequires:  cargo >= 1.47
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
+BuildRequires:  cargo >= 1.51
+BuildRequires:  rust >= 1.51
+%else
+# Newer sle/leap/tw use parallel versioned rust releases which have
+# a different method for provides that we can use to request a
+# specific version
+BuildRequires:  rust+cargo >= 1.51
+%endif
 %if 0%{useccache} != 0
 BuildRequires:  ccache
 %endif
@@ -110,8 +121,8 @@ BuildRequires:  libidl-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
-BuildRequires:  mozilla-nspr-devel >= 4.31
+BuildRequires:  mozilla-nspr-devel >= 4.32
-BuildRequires:  mozilla-nss-devel >= 3.66
+BuildRequires:  mozilla-nss-devel >= 3.68
 BuildRequires:  nasm >= 2.14
 BuildRequires:  nodejs >= 10.22.1
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
@@ -121,7 +132,6 @@ BuildRequires:  python36
 BuildRequires:  python3 >= 3.5
 BuildRequires:  python3-devel
 %endif
-BuildRequires:  rust >= 1.47
 BuildRequires:  rust-cbindgen >= 0.19.0
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
@@ -367,6 +377,12 @@ sed -i "s/python3/python36/g" mach
 export PYTHON3=/usr/bin/python36
 %endif
 
+# Webrender does not support big endian yet, so we are forcing it off
+# see: https://bugzilla.mozilla.org/show_bug.cgi?id=1716707
+%ifarch s390x ppc64
+echo 'pref("gfx.webrender.force-disabled", true);' >> %{SOURCE9}
+%endif
+
 #
 kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
 if test "$kdehelperversion" != %{kde_helper_version}; then
@@ -652,11 +668,8 @@ cp %{SOURCE17} %{buildroot}%{_datadir}/gnome-shell/search-providers
 #
 mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
 mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
-%if %branding
 # Install symbolic icon for GNOME
-mkdir -p %{buildroot}%{gnome_dir}/share/icons/hicolor/symbolic/apps/
+%if %branding
-cp %{_builddir}/%{srcname}-%{orig_version}/browser/branding/official/content/identity-icons-brand.svg \
-   %{buildroot}%{gnome_dir}/share/icons/hicolor/symbolic/apps/%{progname}-symbolic.svg
 for size in 16 22 24 32 48 64 128 256; do
 %else
 for size in 16 32 48; do

firefox-90.0.2.source.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35c45dbc21a7bd59e5daa6b3fef7a08c51ff0a1333f47a355bb1cbc840c3ff59
-size 380670372

firefox-90.0.2.source.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmD4mxoACgkQ6+QekPbx
-L20sbhAAsWHM4fg9Bg1SloKaRKFHIsrOXJv2rT/5vpdNtnwglzec4oTktsPmXBLH
-LcjUR7vYYN62XzrkyKWnmq2zq9NVUlP6gLNURx6M9WCeIDznjBpnUiqQFmUjJgBD
-vMaB/Onm6cOq4AThnCcHb25klkbhYHuHrjQur8Gr2fkfsxt3blltn/RvSbL2Z4WQ
-u4HciF5du5kx5nXxZ062lyOyDGsoN2VG/TrhB22k68KxBD3vH+eHq9QVGpH2RhM4
-8CLRuC6TcodRJ4fcIvvX84k4Va27+YL70z3Zn27vg8eK/GAuJ7GFwA+aJyClq4jt
-dKKkWFgJODySCc4iHRv6JHdkHI8UolChUQPPciQnPJ3Q6FvO8XaDpLP+l4Y90pJc
-kvaDddrHE/L2cSqyqGv5YgElNyqYZwtFtj84cQ/d6VpwUu8k8+wl0XPxmliFqz7b
-Jb1oniJ/Yq4ncZ6vj+JvC8QIcWncKI5OvKeKSBH6hSMj1EX2ckJW3BqEkmrwIpi3
-LtY2K1d6CLHrVzhBoDTcyjBbee7DY2RFbRZfbI7/QfqcEzW3TVa10b/fWjvKkWLW
-a+vvW3swN0vzlQPESTRsWaMT1jzU8UgFt7XuukXJam+QrkZ3er0GjUQEn++5HZpS
-mF/C/17CMP0vGKFXyhuNYfT+Ivq0EJ9t/4Y7mV7M8GBLGOAm6Qk=
-=89GF
------END PGP SIGNATURE-----

firefox-91.0.source.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+size 380788436

firefox-91.0.source.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmELCxkACgkQ6+QekPbx
+L21mQw/+KcoiD77SPNRcX/xG6FaR86/RmVcBok22u8/iJfPiN6nP9tDintsex29R
+tbCtmytPfmk3OQhT4iPY0i5BUKYqpXO/hQQQNgSgWpqlLRjF3SJ8sRz6BwNF1mL8
+UvJkB7w3e7zXPhnVllMD3pVEhqjYqu5J1wsT5F1voVWkVD2A9JLNrbvJ3EjFXShL
+TBFLjpLVzVF7lf9FVsy9oh/wQqzRb7HBZ3Gooe6B0QnX3k/JwVPG9qLTbSK6iKye
+O7Y3M5znC1txgvlNhPi7qCUyx5xYH6LXpgVhK+orrRAOHSHtilgWbom4hLiChloX
+j2rtiYnqvTMwktpvJjbhJDSgGcYEVt0QG09zvG5aKdTyiaSwVFswW9km9AghhAI9
+9VS25nOn/eVIXdRafvfTNFNJcPdIkechMe9Cg9Hcj2T8Vh+owNruOrlXjOakjRlz
+u6lyJZH2Q2J3JdXLxaZze+zgOlI3TnKozmVBBjUOJqUKSoQ22F8uhpzU9VaU23wa
+XLXOjkzQTN0/JVfKzCcaGDLqp9Fpmvrh2SzmF5zQ1hBGNcoW+6XQkOYVmRJGs4vY
+yd70lkdvY2P+etmgTxS7IzDQh4cSo/f72GYbKbFgZaLGb4ojbT/Sm/mkuUZQJQBE
+eJBSIBLhplV4xFrJ0+9Lp8Sx67GGRFbcYniZkHN+hMNBVdmYnf0=
+=2an+
+-----END PGP SIGNATURE-----

l10n-90.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f84e59fe121846f3e2d5a2249417a2619d773d3cf58f4296284c8e3ea2aeef43
-size 51649404

l10n-91.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51fc69a958d5f792b3d0ef94d4f9da9313685df94597eb21a0fb58e15eb9e64b
+size 51031676

mozilla-reduce-rust-debuginfo.patch

@@ -1,54 +1,28 @@
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1560754926 -7200
-#      Mon Jun 17 09:02:06 2019 +0200
-# Node ID 428161c3b9599083e1b8710eda1760f1f707ab11
-# Parent  d55730171edb1935dec80234eba336787ff0e4e8
-#Description: reduce the rust debuginfo level on selected architectures where
-# compiling with debuginfo=2 causes the OOM killer to interrupt the build on
-# launchpad builders. Initially this was only on 32 bit architectures, but with
-# firefox 63 it started happening frequently on arm64 and ppc64el too.
-
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
-@@ -603,18 +603,19 @@ set_config("CARGO_PROFILE_DEV_OPT_LEVEL"
+@@ -610,6 +610,7 @@ set_config("CARGO_PROFILE_DEV_OPT_LEVEL"
- 
- 
- @depends(
-     rustc_opt_level,
-     debug_rust,
-     target,
-     "--enable-debug-symbols",
      "--enable-frame-pointers",
-+    host,
+     path_remapping,
+     path_remappings,
++    host
  )
--def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers):
+ def rust_compile_flags(
-+def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers, host):
+     opt_level,
+@@ -619,6 +620,7 @@ def rust_compile_flags(
+     frame_pointers,
+     path_remapping,
+     path_remappings,
++    host
+ ):
      # Cargo currently supports only two interesting profiles for building:
      # development and release. Those map (roughly) to --enable-debug and
-     # --disable-debug in Gecko, respectively.
+@@ -642,6 +644,8 @@ def rust_compile_flags(
-     #
-     # But we'd also like to support an additional axis of control for
-     # optimization level. Since Cargo only supports 2 profiles, we're in
-     # a bit of a bind.
-     #
-@@ -627,16 +628,18 @@ def rust_compile_flags(opt_level, debug_
- 
-     # opt-level=0 implies -C debug-assertions, which may not be desired
-     # unless Rust debugging is enabled.
-     if opt_level == "0" and not debug_rust:
-         debug_assertions = False
  
      if debug_symbols:
          debug_info = "2"
-+        if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64':
++        if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64' or host.cpu == 's390x':
 +            debug_info = '1'
  
      opts = []
  
-     if debug_assertions is not None:
-         opts.append("debug-assertions=%s" % ("yes" if debug_assertions else "no"))
-     if debug_info is not None:
-         opts.append("debuginfo=%s" % debug_info)
-     if frame_pointers:

tar_stamps

@@ -1,11 +1,10 @@
 PRODUCT="firefox"
 CHANNEL="release"
-VERSION="90.0.2"
+VERSION="91.0"
 VERSION_SUFFIX=""
-PREV_VERSION="90.0.1"
+PREV_VERSION="90.0.2"
 PREV_VERSION_SUFFIX=""
 #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
-
 RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
-RELEASE_TAG="cda19fb46018c9cb8dc5e6127ebb2cfd04aa9be4"
+RELEASE_TAG="f51367289e745398258bb394fe2001e807faa048"
-RELEASE_TIMESTAMP="20210721174149"
+RELEASE_TIMESTAMP="20210804193234"