diff options
| -rw-r--r-- | waterfox/waterfox-mozconfig | 1 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 43 |
2 files changed, 36 insertions, 8 deletions
diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig index 8b58d95..cb7514a 100644 --- a/waterfox/waterfox-mozconfig +++ b/waterfox/waterfox-mozconfig @@ -36,7 +36,6 @@ ac_add_options --disable-signmar ac_add_options --disable-verify-mar ac_add_options --enable-rust-simd -ac_add_options --enable-stylo=build ac_add_options --with-app-name=waterfox ac_add_options --with-app-basename=Waterfox diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 2e827e8..bdfbf3c 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit fa114d424de1ccfc6a8ee5b13cef8b506d0d87eb +%global commit eeb3b0b1fd0e42ea902f3f3731f1265597e6627d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190313 +%global date 20190411 %global with_snapshot 1 %global freebsd_rev 480450 @@ -25,7 +25,12 @@ ExcludeArch: armv7hl %global system_ffi 1 %global system_cairo 0 %global system_harfbuzz 1 +# libvpx is too new for Firefox 65 +%if 0%{?fedora} < 30 %global system_libvpx 1 +%else +%global system_libvpx 0 +%endif %global system_webp 1 %global system_vorbis 1 %global system_libicu 0 @@ -71,6 +76,13 @@ ExcludeArch: armv7hl %global disable_elfhack 1 %endif +# Set to build with pinned rust version +# This enables stylo build when default rust version is not supported +# and a downgraded rust package exists +%global build_with_pinned_rust 1 +%global rust_build_min_ver 1.32 +%global rust_build_min_nover 1.33 + %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} # Minimal required versions @@ -120,7 +132,7 @@ ExcludeArch: armv7hl Summary: Waterfox Web browser Name: waterfox Version: 56.2.8 -Release: 3%{?gver}%{?dist} +Release: 4%{?gver}%{?dist} URL: https://www.waterfoxproject.org License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -185,7 +197,7 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -Patch450: %{vc_url}/pull/888.patch#/%{name}-gh-pull888.patch +Patch450: %{vc_url}/pull/915.patch#/%{name}-gh-pull915.patch # Debian patches Patch500: mozilla-440908.patch @@ -310,8 +322,13 @@ BuildRequires: xorg-x11-server-Xvfb %if 0%{?build_with_pgo} || !0%{?run_tests} BuildRequires: librsvg2 %endif +%if 0%{?build_with_pinned_rust} +BuildRequires: (rust >= %{rust_build_min_ver} with rust < %{rust_build_min_nover}) +BuildRequires: (cargo >= %{rust_build_min_ver} with cargo < %{rust_build_min_nover}) +%else BuildRequires: rust BuildRequires: cargo +%endif BuildRequires: clang-devel Obsoletes: mozilla <= 37:1.7.13 @@ -415,7 +432,7 @@ filterdiff -x dom/svg/crashtests/crashtests.list %{freebsd_root}/patch-bug134314 > _patches/patch-bug1343147 filterdiff -x dom/security/test/csp/mochitest.ini %{freebsd_root}/patch-bug1381761 \ > _patches/patch-bug1381761 - + for i in 1404057 1404324 1404180 1405878 ;do filterdiff \ -x layout/style/crashtests/crashtests.list \ @@ -587,6 +604,12 @@ echo "ac_add_options --without-system-icu" >> .mozconfig echo "ac_add_options --disable-ion" >> .mozconfig %endif +%if 0%{?build_with_pinned_rust} +echo "ac_add_options --enable-stylo=build" >> .mozconfig +%else +echo "ac_add_options --disable-stylo" >> .mozconfig +%endif + # Remove executable bit to make brp-mangle-shebangs happy. chmod -x third_party/rust/itertools/src/lib.rs @@ -655,6 +678,8 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-Werror=format-security//') %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//')" +%else +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wno-error=alloc-size-larger-than= -Wno-error=free-nonheap-object" %endif %if %{?hardened_build} MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" @@ -987,7 +1012,7 @@ fi %{mozappdir}/platform.ini %{mozappdir}/plugin-container %{mozappdir}/gmp-clearkey -%{mozappdir}/fonts/EmojiOneMozilla.ttf +%{mozappdir}/fonts/TwemojiMozilla.ttf %if !0%{?system_libicu} %{mozappdir}/icudt*.dat %endif @@ -1001,9 +1026,13 @@ fi #--------------------------------------------------------------------- %changelog -* Fri Mar 29 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-3.20190313gitfa114d4 +* Mon Apr 15 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-4.20190411giteeb3b0b - repackage for stackrpms +* Fri Apr 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.8-2.20190411giteeb3b0b +- New snapshot +- Better rust BR version control with build_with_pinned_rust switch + * 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+ |