diff -r 71a92b4d0527 -r b8c834aafde2 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Thu Jan 28 23:39:24 2021 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Mar 17 12:24:14 2021 +0100 @@ -17,6 +17,9 @@ # +%define _dwz_low_mem_die_limit 40000000 +%define _dwz_max_die_limit 200000000 + %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150100 #!BuildIgnore: post-build-checks %endif @@ -29,9 +32,9 @@ # orig_suffix b3 # major 69 # mainver %major.99 -%define major 85 +%define major 87 %define mainver %major.0 -%define orig_version 85.0 +%define orig_version 87.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -101,7 +104,7 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.29 -BuildRequires: mozilla-nss-devel >= 3.60.1 +BuildRequires: mozilla-nss-devel >= 3.62 BuildRequires: nasm >= 2.14 BuildRequires: nodejs10 >= 10.22.1 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 @@ -112,7 +115,7 @@ BuildRequires: python3-devel %endif BuildRequires: rust >= 1.47 -BuildRequires: rust-cbindgen >= 0.15.0 +BuildRequires: rust-cbindgen >= 0.16.0 BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel @@ -175,7 +178,7 @@ Source11: firefox.1 Source12: mozilla-get-app-id Source13: spellcheck.js -Source14: https://github.com/openSUSE/firefox-scripts/raw/5e54f4a/create-tar.sh +Source14: https://github.com/openSUSE/firefox-scripts/raw/4503820/create-tar.sh Source15: firefox-appdata.xml Source16: %{name}.changes Source17: firefox-search-provider.ini @@ -202,7 +205,6 @@ Patch15: mozilla-bmo1504834-part1.patch Patch16: mozilla-bmo1504834-part2.patch Patch17: mozilla-bmo1504834-part3.patch -Patch18: mozilla-bmo1554971.patch Patch19: mozilla-bmo1512162.patch Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch @@ -217,8 +219,8 @@ Patch102: firefox-branded-icons.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): coreutils shared-mime-info desktop-file-utils -Requires(postun): shared-mime-info desktop-file-utils +Requires(post): coreutils shared-mime-info desktop-file-utils +Requires(postun):shared-mime-info desktop-file-utils Requires: %{name}-branding >= 68 %requires_ge mozilla-nspr %requires_ge mozilla-nss @@ -299,16 +301,6 @@ %description branding-upstream This package provides upstream look and feel for %{appname}. -%if %crashreporter -%package buildsymbols -Summary: Breakpad buildsymbols for %{appname} -Group: Development/Debug - -%description buildsymbols -This subpackage contains the Breakpad created and compatible debugging -symbols meant for upload to Mozilla's crash collector database. -%endif - %if !%{with only_print_mozconfig} %prep %if %localize @@ -341,7 +333,6 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 @@ -431,7 +422,7 @@ echo "" cat << EOF %else -%ifarch aarch64 %arm +%ifarch aarch64 %arm ppc64 ppc64le %limit_build -m 2000 %endif cat << EOF > $MOZCONFIG @@ -514,16 +505,6 @@ %endif EOF %if !%{with only_print_mozconfig} -%ifarch ppc64 s390x s390 -# NOTE: Currently, system-icu is too old, so we can't build with that, -# but have to generate the .dat-file freshly. This seems to be a -# less fragile approach anyways. -# ac_add_options --with-system-icu -echo "Generate big endian version of config/external/icu/data/icud58l.dat" -./mach python intl/icu_sources_data.py . -ls -l config/external/icu/data -rm -f config/external/icu/data/icudt*l.dat -%endif ccache -s %if 0%{?do_profiling} xvfb-run --server-args="-screen 0 1920x1080x24" \ @@ -706,18 +687,6 @@ # fdupes %fdupes %{buildroot}%{progdir} %fdupes %{buildroot}%{_datadir} -# create breakpad debugsymbols -%if %crashreporter -SYMBOLS_NAME="firefox-%{version}-` echo '%{release}' | sed 's@\.[^\.]\+$@@' `.%{_arch}-%{suse_version}-symbols" -make buildsymbols \ - SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ - SYMBOL_FULL_ARCHIVE_BASENAME="$SYMBOLS_NAME-full" \ - SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" -if [ -e dist/*symbols.zip ]; then - mkdir -p %{buildroot}%{_datadir}/mozilla/ - cp dist/*symbols.zip %{buildroot}%{_datadir}/mozilla/ -fi -%endif %clean rm -rf %{buildroot} @@ -812,10 +781,4 @@ %defattr(-,root,root) %dir %{progdir} -%if %crashreporter -%files buildsymbols -%defattr(-,root,root) -%{_datadir}/mozilla/*.zip -%endif - %changelog