diff options
Diffstat (limited to 'waterfox/waterfox.spec')
| -rw-r--r-- | waterfox/waterfox.spec | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index b5f3ae0..2e827e8 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit f367fd24ba208519742e7370fb1478c3ed0d14c7 +%global commit fa114d424de1ccfc6a8ee5b13cef8b506d0d87eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190201 +%global date 20190313 %global with_snapshot 1 %global freebsd_rev 480450 @@ -119,7 +119,7 @@ ExcludeArch: armv7hl Summary: Waterfox Web browser Name: waterfox -Version: 56.2.7.1 +Version: 56.2.8 Release: 3%{?gver}%{?dist} URL: https://www.waterfoxproject.org License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -151,7 +151,6 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch20: firefox-build-prbool.patch Patch25: rhbz-1219542-s390-build.patch Patch26: build-icu-big-endian.patch -Patch27: mozilla-1335250.patch Patch30: fedora-build.patch Patch31: build-ppc64-s390x-curl.patch Patch32: build-rust-ppc64le.patch @@ -160,8 +159,6 @@ Patch36: build-missing-xlocale-h.patch # Always feel lucky for unsupported platforms: # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128 Patch37: build-jit-atomic-always-lucky.patch -# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x) -Patch38: build-cacheFlush-missing.patch Patch39: mozilla-1494037.patch # Fedora specific patches @@ -178,7 +175,6 @@ Patch230: rhbz-1497932.patch Patch402: mozilla-1196777.patch Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch -Patch414: mozilla-1435695.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch416: bug1375074-save-restore-x28.patch Patch417: mozilla-1436242.patch @@ -186,9 +182,10 @@ Patch418: https://hg.mozilla.org/integration/autoland/raw-rev/342812d23eb Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mozilla-1389436.patch -# Upstream updates +# Upstream updates/PRs -#Patch???: %%{vc_url}/commit/commit.patch#/wf-commit.patch +#Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch +Patch450: %{vc_url}/pull/888.patch#/%{name}-gh-pull888.patch # Debian patches Patch500: mozilla-440908.patch @@ -206,6 +203,7 @@ Patch700: %{name}-nolangpacks.patch Patch701: %{name}-waterfoxdir-1.patch Patch702: %{name}-waterfoxdir-2.patch Patch703: %{name}-webrtc-gtest-libv4l2.patch +Patch704: %{name}-fix-testing-file.patch %if 0%{?system_nss} @@ -309,6 +307,9 @@ BuildRequires: pkgconfig(libffi) %if 0%{?use_xvfb} BuildRequires: xorg-x11-server-Xvfb %endif +%if 0%{?build_with_pgo} || !0%{?run_tests} +BuildRequires: librsvg2 +%endif BuildRequires: rust BuildRequires: cargo BuildRequires: clang-devel @@ -385,7 +386,6 @@ This package contains results of tests executed during build. %patch402 -p1 -b .1196777 %patch406 -p1 -b .256180 %patch413 -p1 -b .1353817 -%patch414 -p1 -b .1435695 %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 %endif @@ -395,6 +395,8 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 +%patch450 -p1 -b .pull888 + # Debian extension patch %patch500 -p1 -b .440908 @@ -443,6 +445,7 @@ done %patch701 -p1 -b .waterfoxdir-1 %patch702 -p1 -b .waterfoxdir-2 %patch703 -p1 -b .lv4l2 +%patch704 -p1 -b .fix-testing-file # Patch for big endian platforms only %if 0%{?big_endian} @@ -643,7 +646,12 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS $(echo "%{optflags}" | sed -e 's/-Wall//')" # for some sources # Explicitly force the hardening flags for Waterfox so it passes the checksec test; # See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages +%if 0%{?fedora} < 30 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security" +%else +# Workaround for mozbz#1531309 +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-Werror=format-security//') +%endif %if 0%{?build_with_clang} # Fedora's default compiler flags conflict with what clang supports MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fstack-clash-protection//')" @@ -993,9 +1001,18 @@ fi #--------------------------------------------------------------------- %changelog -* Wed Mar 6 2019 B Stack <bgstack15@gmail.com> - 56.2.7.1-3.20190201gitf367fd2 +* Fri Mar 29 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-3.20190313gitfa114d4 - repackage for stackrpms +* Thu Mar 14 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.8-1.20190313gitfa114d4 +- New release/snapshot +- Temporary fix to rust BR, build is failing with 1.33+ +- format-security flags changes from Fedora Firefox + +* Mon Mar 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-3.20190303git61bdb81 +- New snapshot +- Rework MOZ_OPT_FLAGS to enable better parallel LTO build support + * Wed Feb 13 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-2.20190201gitf367fd2 - LTO and fixes to build with it |