diff options
| -rw-r--r-- | waterfox/debian/changelog | 6 | ||||
| -rw-r--r-- | waterfox/debian/mozconfig | 7 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 33 |
3 files changed, 29 insertions, 17 deletions
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index cd01481..0c6eb34 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (56.2.12-1+devuan) manual; urgency=medium + + * Patches for [mfsa2019-22](https://www.mozilla.org/en-US/security/advisories/mfsa2019-22/). + + -- B Stack <bgstack15@gmail.com> Mon, 11 Jul 2019 10:07:44 -0400 + waterfox (56.2.11-2+devuan) manual; urgency=medium * Repackaged for obs, which required disabling rust-simd. diff --git a/waterfox/debian/mozconfig b/waterfox/debian/mozconfig index 6448a69..e2a51c9 100644 --- a/waterfox/debian/mozconfig +++ b/waterfox/debian/mozconfig @@ -26,10 +26,9 @@ ac_add_options --disable-updater ac_add_options --enable-release -# this line works for OBS, but not on private infrastructure. -if ! test `lsb_release -sc` = "stretch" && ! test `lsb_release -sc` = "jessie" && ! test `lsb_release -sc` = "buster"; then -ac_add_options --enable-rust-simd # on x86 requires SSE2 -fi +# Turn rust-simd on for local builds, off for OBS +#ac_add_options --enable-rust-simd # on x86 requires SSE2 +ac_add_options --disable-rust-simd ac_add_options --enable-stylo=build diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index f552510..9385d96 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit 63b480e7462482482f6609c305cd793d938f58c0 +%global commit 1bc2fb60abf0fa173b69ca94f660115d76f09f4f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190625 +%global date 20190709 %global with_snapshot 1 %global freebsd_rev 480450 @@ -80,7 +80,7 @@ ExcludeArch: armv7hl # and a downgraded rust package exists %global build_with_pinned_rust 0 %global rust_build_min_ver 1.35 -%global rust_build_min_nover 1.36 +%global rust_build_min_nover 1.37 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -148,6 +148,7 @@ ExcludeArch: armv7hl %global system_libvpx 0 %global build_stylo 0 %global build_rust_simd 0 +%global build_with_pgo 0 %if "%{?scl_env}" != "" BuildRequires: %{scl_buildreq} %endif @@ -155,9 +156,9 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 56.2.11 +Version: 56.2.12 Release: 11%{?gver}%{?dist} -URL: https://www.waterfoxproject.org +URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ %global vc_url https://github.com/MrAlex94/Waterfox @@ -300,18 +301,17 @@ BuildRequires: pkgconfig(icu-i18n) BuildRequires: yasm BuildRequires: llvm BuildRequires: llvm-devel -# this one differs from chinfo. It needs to be before clang, for el7 -%if 0%{?build_with_clang} +%if !0%{?el7} BuildRequires: clang BuildRequires: clang-libs +BuildRequires: clang-devel BuildRequires: lld BuildRequires: libstdc++-static +%endif %if 0%{?build_with_pgo} BuildRequires: compiler-rt %endif -%else BuildRequires: gcc-c++ -%endif BuildRequires: bash BuildRequires: patchutils @@ -322,6 +322,7 @@ Requires: p11-kit-trust Requires: nspr >= %{nspr_build_version} Requires: nss >= %{nss_build_version} %endif +BuildRequires: perl-interpreter BuildRequires: python2-devel Requires: u2f-hidraw-policy @@ -352,7 +353,6 @@ BuildRequires: (cargo >= %{rust_build_min_ver} with cargo < %{rust_build_min_no BuildRequires: rust BuildRequires: cargo %endif -BuildRequires: clang-devel Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -730,12 +730,12 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/ -g1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif -%ifarch %{arm} +%ifarch %{arm} %{ix86} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/-g0 /') export MOZ_DEBUG_FLAGS=" " %endif %if !0%{?build_with_clang} -%ifarch s390 ppc aarch64 +%ifarch s390 ppc aarch64 %{ix86} MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif %ifarch %{arm} @@ -1067,9 +1067,16 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Jun 27 2019 B Stack <bgstack15@gmail.com> - 56.2.11-11.20190625git63b480e +* Thu Jul 11 2019 B Stack <bgstack15@gmail.com> - 56.2.12-11 - add el7 support, which uses provided libs for the most part, and disables lto - repackage for stackrpms +- Switch to release versions and not specific commits from upstream + +* Wed Jul 10 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.12-1.20190709git1bc2fb6 +- New release/snapshot +- Fix URL +- BR: perl-interpreter +- Reenable elfhack * Tue Jun 25 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.11-2.20190625git63b480e - New snapshot |