mozilla: comparison MozillaFirefox/MozillaFirefox.spec

equal deleted inserted replaced

-:8df86bf11fc1
+:4cfe46c9a944
 # orig_version would be the upstream tar ball
 # orig_version 70.0
 # 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
 %define devpkg         1
 %if 0%{?suse_version} <= 1320
 BuildRequires:  gcc9-c++
 %else
 BuildRequires:  gcc-c++
 %endif
-BuildRequires:  cargo >= 1.43
+BuildRequires:  cargo >= 1.44
 BuildRequires:  ccache
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libiw-devel
 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
 BuildRequires:  python-libxml2
 BuildRequires:  python36
 %else
 BuildRequires:  python3 >= 3.5
 BuildRequires:  python3-devel
 %endif
-BuildRequires:  rust >= 1.43
+BuildRequires:  rust >= 1.44
-BuildRequires:  rust-cbindgen >= 0.14.3
+BuildRequires:  rust-cbindgen >= 0.15.0
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXt-devel
 %if 0%{?do_profiling}
 BuildRequires:  xvfb-run
 Patch4:         mozilla-aarch64-startup-crash.patch
 Patch6:         mozilla-sandbox-fips.patch
 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
 Patch15:        mozilla-bmo1504834-part1.patch
 Patch16:        mozilla-bmo1504834-part2.patch
 Patch24:        mozilla-bmo1602730.patch
 Patch25:        mozilla-bmo998749.patch
 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
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %patch11 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1 -R
 # Firefox
 %patch101 -p1
 %patch102 -p1
 %endif
 %endif
 ./mach build -v
 # 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
 # We do this, by creating a mozconfig-template with the necessary switches
 # and a placeholder obj-dir, which gets copied and modified for each language
 %ifarch %ix86
 %define njobs 1
 %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
 cp ${MOZCONFIG}_LANG ${MOZCONFIG}_$locale
 sed -i "s|obj_LANG|obj_$locale|" ${MOZCONFIG}_$locale
 export MOZCONFIG=${MOZCONFIG}_$locale
 # 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
+$RPM_BUILD_DIR/langpacks_artifacts/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
 # 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
 [ "$_match" = "$locale" ] && _matched=1
 done
 #DEBUG (break the build if searchplugins are missing / temporary)
 grep amazondotcom dist/firefox/browser/omni.ja
 # 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)
 %if "%{srcname}" != "%{progname}"
 mv %{buildroot}%{progdir}/%{srcname} %{buildroot}%{progdir}/%{progname}

branch	firefox84
changeset 1152	4cfe46c9a944
parent 1151	8df86bf11fc1
child 1153	fdd746757dda