diff options
| author | Jan Horak <jhorak@redhat.com> | 2019-08-14 16:04:42 +0200 |
|---|---|---|
| committer | Jan Horak <jhorak@redhat.com> | 2019-08-14 16:04:42 +0200 |
| commit | 31bcafc8cb522d81f1d51dd2bb7ebf47eb1c7ef0 (patch) | |
| tree | 2c0907d1003722b22277e0f26a0dce287ece59ab /firefox.spec | |
| parent | Use make -j1 for debugging purposes (diff) | |
| download | librewolf-fedora-ff-31bcafc8cb522d81f1d51dd2bb7ebf47eb1c7ef0.tar.gz librewolf-fedora-ff-31bcafc8cb522d81f1d51dd2bb7ebf47eb1c7ef0.tar.bz2 librewolf-fedora-ff-31bcafc8cb522d81f1d51dd2bb7ebf47eb1c7ef0.zip | |
Update to 60.8.1
Diffstat (limited to 'firefox.spec')
| -rw-r--r-- | firefox.spec | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/firefox.spec b/firefox.spec index 05724f9..76a654c 100644 --- a/firefox.spec +++ b/firefox.spec @@ -23,6 +23,8 @@ ExcludeArch: s390x # Build PGO+LTO on x86_64 and aarch64 only due to build issues # on other arches. %ifarch x86_64 aarch64 +# FIXME disable PGO because of -j1 build would take ages +%global disable_multiprocess_compilation 1 %if %{release_build} %global build_with_pgo 0 %else @@ -87,13 +89,13 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox -Version: 68.0.1 -Release: 3%{?pre_tag}%{?dist} +Version: 68.0.2 +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20190722.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20190814.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -134,7 +136,6 @@ Patch224: mozilla-1170092.patch #ARM run-time patch Patch226: rhbz-1354671.patch Patch227: firefox-locale-debug.patch -Patch228: firefox-SIOCGSTAMP.patch # Upstream patches Patch402: mozilla-1196777.patch @@ -340,7 +341,6 @@ This package contains results of tests executed during build. %patch226 -p1 -b .1354671 %endif %patch227 -p1 -b .locale-debug -%patch228 -p1 -b .SIOCGSTAMP %patch402 -p1 -b .1196777 #%patch413 -p1 -b .1353817 @@ -558,17 +558,19 @@ echo "ac_add_options --enable-lto" >> .mozconfig MOZ_SMP_FLAGS=-j1 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel, # however builds tend to fail on other arches when building in parallel. +%if !%{?disable_multiprocess_compilation} %ifarch %{ix86} [ -z "$RPM_BUILD_NCPUS" ] && \ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -#[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 %endif %ifarch x86_64 ppc ppc64 ppc64le aarch64 [ -z "$RPM_BUILD_NCPUS" ] && \ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -#[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 -#[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 -#[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 +[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 +[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 +%endif %endif export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" @@ -577,7 +579,7 @@ export STRIP=/bin/true %if 0%{?build_with_pgo} GDK_BACKEND=x11 xvfb-run ./mach build 2>&1 | cat - %else -env RUST_LOG=debug strace -y -f ./mach build -v 2>&1 | cat - +./mach build -v 2>&1 | cat - %endif # create debuginfo for crash-stats.mozilla.com @@ -929,6 +931,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Aug 14 2019 Jan Horak <jhorak@redhat.com> - 68.0.2-1 +- Update to 68.0.2 + * Mon Aug 5 2019 Jan Horak <jhorak@redhat.com> - 68.0.1-3 - Added workaround fix for webrtc indicator |