mozilla: comparison MozillaFirefox/MozillaFirefox.spec

equal deleted inserted replaced

-:7481543bab31
+:f9b2d408b7ef
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #               2006-2021 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # orig_version would be the upstream tar ball
 # orig_version 70.0
 # orig_suffix b3
 # major 69
 # mainver %major.99
-%define major          95
+%define major          96
-%define mainver        %major.0.2
+%define mainver        %major.0.3
-%define orig_version   95.0.2
+%define orig_version   96.0.3
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
 %define devpkg         1
 %define do_profiling   0
 # upstream default is clang (to use gcc for large parts set to 0)
 %define clang_build    0
-# PIE, full relro
-%define build_hardened 1
 %bcond_with only_print_mozconfig
 # define if ccache should be used or not
-%define useccache     1
+%define useccache     0
 # SLE-12 doesn't have this macro
 %{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d}
 # Firefox only supports i686
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
-BuildRequires:  mozilla-nspr-devel >= 4.32
+BuildRequires:  mozilla-nspr-devel >= 4.33
-BuildRequires:  mozilla-nss-devel >= 3.71
+BuildRequires:  mozilla-nss-devel >= 3.73.1
 BuildRequires:  nasm >= 2.14
 BuildRequires:  nodejs >= 10.22.1
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
 BuildRequires:  python-libxml2
 BuildRequires:  python36
 # Gecko/Toolkit
 Patch1:         mozilla-nongnome-proxies.patch
 Patch2:         mozilla-kde.patch
 Patch3:         mozilla-ntlm-full-path.patch
 Patch4:         mozilla-aarch64-startup-crash.patch
-Patch6:         mozilla-sandbox-fips.patch
+Patch5:         mozilla-fix-aarch64-libopus.patch
-Patch7:         mozilla-fix-aarch64-libopus.patch
+Patch6:         mozilla-s390-context.patch
-Patch9:         mozilla-s390-context.patch
+Patch7:         mozilla-pgo.patch
-Patch10:        mozilla-pgo.patch
+Patch8:         mozilla-reduce-rust-debuginfo.patch
-Patch11:        mozilla-reduce-rust-debuginfo.patch
+Patch9:         mozilla-bmo1005535.patch
-Patch13:        mozilla-bmo1005535.patch
+Patch10:        mozilla-bmo1568145.patch
-Patch14:        mozilla-bmo1568145.patch
+Patch11:        mozilla-bmo1504834-part1.patch
-Patch15:        mozilla-bmo1504834-part1.patch
+Patch12:        mozilla-bmo1504834-part2.patch
-Patch16:        mozilla-bmo1504834-part2.patch
+Patch13:        mozilla-bmo1504834-part3.patch
-Patch17:        mozilla-bmo1504834-part3.patch
+Patch14:        mozilla-bmo1512162.patch
-Patch19:        mozilla-bmo1512162.patch
+Patch15:        mozilla-fix-top-level-asm.patch
-Patch20:        mozilla-fix-top-level-asm.patch
+Patch16:        mozilla-bmo1504834-part4.patch
-Patch21:        mozilla-bmo1504834-part4.patch
+Patch17:        mozilla-bmo849632.patch
-Patch22:        mozilla-bmo849632.patch
+Patch18:        mozilla-bmo998749.patch
-Patch25:        mozilla-bmo998749.patch
+Patch19:        mozilla-bmo1626236.patch
-Patch26:        mozilla-bmo1626236.patch
+Patch20:        mozilla-s390x-skia-gradient.patch
-Patch27:        mozilla-s390x-skia-gradient.patch
+Patch21:        mozilla-libavcodec58_91.patch
-Patch28:        mozilla-libavcodec58_91.patch
+Patch22:        mozilla-silence-no-return-type.patch
-Patch29:        mozilla-silence-no-return-type.patch
+Patch23:        mozilla-bmo531915.patch
-Patch31:        mozilla-bmo531915.patch
-Patch32:        mozilla-bmo1745560.patch
-Patch33:        mozilla-bmo1744896.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %setup -q -n %{srcname}-%{orig_version} -b 7
 %else
 %setup -q -n %{srcname}-%{orig_version}
 %endif
 cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
-%patch1 -p1
+%autopatch -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch7 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-# Firefox
-%patch101 -p1
-%patch102 -p1
 %endif
 %build
 %if !%{with only_print_mozconfig}
 # no need to add build time to binaries
 export CC=gcc-9
 %else
 %if 0%{?clang_build} == 0
 export CC=gcc
 export CXX=g++
+%if 0%{?gcc_version:%{gcc_version}} >= 12
+export CFLAGS="$CFLAGS -fimplicit-constexpr"
+%endif
 %endif
 %endif
 %ifarch %arm %ix86
 # Limit RAM usage during link
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
-%if 0%{?build_hardened}
 export LDFLAGS="${LDFLAGS} -fPIC -Wl,-z,relro,-z,now"
-%endif
 %ifarch ppc64 ppc64le
 %if 0%{?clang_build} == 0
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
 %endif
 echo "export BUILD_OFFICIAL=1"
 echo "export MOZ_TELEMETRY_REPORTING=1"
 echo ""
 cat << EOF
 %else
-%ifarch aarch64 %arm ppc64 ppc64le
+%ifarch aarch64 ppc64 ppc64le x86_64
-%limit_build -m 2000
+%limit_build -m 2048
 %endif
 cat << EOF > $MOZCONFIG
 %endif
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 %endif
 # bmo#1441155 - Disable the generation of Rust debug symbols on Linux32
 %ifarch %ix86 %arm
 ac_add_options --disable-debug-symbols
 %else
-ac_add_options --enable-debug-symbols
+ac_add_options --enable-debug-symbols=-g1
+ac_add_options --disable-install-strip
 %endif
 # building with elf-hack started to fail everywhere with FF73
 #%if 0%{?suse_version} > 1549
 %ifnarch aarch64 ppc64 ppc64le s390x
 ac_add_options --disable-elf-hack
 ac_add_options --with-system-zlib
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --enable-alsa
 ac_add_options --disable-debug
-#ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
 ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
 # Google-service currently not available for free anymore
 #ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19}
 ac_add_options --with-google-safebrowsing-api-keyfile=%{SOURCE19}
 ac_add_options --with-unsigned-addon-scopes=app
 ac_add_options --allow-addon-sideload
 # at least temporary until the "wasi-sysroot" issue is solved
 ac_add_options --without-wasm-sandboxed-libraries
+%ifarch x86_64 aarch64
+ac_add_options --enable-rust-simd
+%endif
 %if %branding
 ac_add_options --enable-official-branding
 %endif
 ac_add_options --enable-libproxy
 %if ! %crashreporter

branch	firefox96
changeset 1170	f9b2d408b7ef
parent 1169	7481543bab31
child 1171	130d464159be