From 0e0cda89c1bfc0c33449db2df9955457655705b1 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 18 Feb 2020 14:30:14 -0500 Subject: waterfox spec updated from chinfo --- waterfox/waterfox.spec | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 8ef6b02..6c07fa6 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit 45130a237874aaa96bdf23ee107b0be0e0a2afab +%global commit df884bb1dbafb2c23595ec74b0fd74bc92e5c3c7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20200110 +%global date 20200213 %global with_snapshot 1 %global branch classic @@ -37,6 +37,8 @@ ExcludeArch: armv7hl %global system_libicu 0 %global system_jpeg 1 +%global eme 0 + %global run_tests 0 %global hardened_build 1 @@ -45,7 +47,7 @@ ExcludeArch: armv7hl %global build_with_clang 0 %ifnarch %{ix86} ppc64 s390x -%global build_with_pgo 1 +%global build_with_pgo 0 %endif %ifarch x86_64 @@ -157,8 +159,8 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2020.01 -Release: 11.%{branch}%{?gver}%{?dist} +Version: 2020.02 +Release: 12.%{branch}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -223,7 +225,6 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs/Reverts #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -Patch450: %{vc_url}/pull/1349.patch#/%{name}-gh-pr1349.patch # Debian patches Patch500: mozilla-440908.patch @@ -431,8 +432,6 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 -%patch450 -p1 -b .pr1349 - # Debian extension patch %patch500 -p1 -b .440908 @@ -463,7 +462,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1430508 1433747 1452576 1453127 1466606 \ + 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1430508 1433747 1452576 1453127 1466606 1469257 \ 1384121 1388744 1413143 \ 1447519 do @@ -489,6 +488,8 @@ done %patch36 -p2 -b .xlocale %endif +ln -s media/test dom/test + cp %{SOURCE26} . sed -e 's|_BRANCH_|%{channel}|g' -i distribution.ini @@ -633,6 +634,12 @@ echo "ac_add_options --enable-rust-simd" >> .mozconfig echo "ac_add_options --disable-rust-simd" >> .mozconfig %endif +%if 0%{?eme} +echo "ac_add_options --enable-eme=widevine" >> .mozconfig +%else +echo "ac_add_options --disable-eme" >> .mozconfig +%endif + # Remove executable bit to make brp-mangle-shebangs happy. chmod -x third_party/rust/itertools/src/lib.rs @@ -1077,11 +1084,21 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Jan 16 2020 B Stack - 2020.01-1.classic.20200110git45130a2 +* Tue Feb 18 2020 B Stack - 2020.01-12.classic.20200213gitdf884bb - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Sun Feb 16 2020 Phantom X - 2020.02-2.classic.20200213gitdf884bb +- Disable PGO again + +* Fri Feb 14 2020 Phantom X - 2020.02-1.classic.20200213gitdf884bb +- 2020.02 +- eme optional support switch, disabled by default + +* Thu Jan 16 2020 Phantom X - 2020.01-2.classic.20200110git45130a2 +- PGO crash fix try #1 + * Wed Jan 15 2020 Phantom X - 2020.01-1.classic.20200110git45130a2 - New release/snapshot -- cgit