summaryrefslogtreecommitdiff
path: root/waterfox/waterfox.spec
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-04-14 08:21:22 -0400
committerB Stack <bgstack15@gmail.com>2020-04-14 08:21:22 -0400
commit55e113682281239a64472bc2a7888b51c5742f45 (patch)
treec3841f4464e830af9826ecc34f8213b889c3eae0 /waterfox/waterfox.spec
parentchange comment syntax in d/c (diff)
downloadstackrpms-55e113682281239a64472bc2a7888b51c5742f45.tar.gz
stackrpms-55e113682281239a64472bc2a7888b51c5742f45.tar.bz2
stackrpms-55e113682281239a64472bc2a7888b51c5742f45.zip
wf 202.04 rpm rc1
Diffstat (limited to 'waterfox/waterfox.spec')
-rw-r--r--waterfox/waterfox.spec35
1 files changed, 18 insertions, 17 deletions
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 85db78f..6a8928b 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,9 +1,9 @@
%global _legacy_common_support 1
-%global commit f6fe91ce29333271a5ef97ba148294404d28ab3f
+%global commit d5de4ec99d1d61a309d7fcd96da12488c9afe550
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20200313
-%global with_snapshot 1
+%global date 20200408
+%global with_snapshot 0
%global branch classic
@@ -29,12 +29,7 @@ ExcludeArch: armv7hl
%global system_ffi 1
%global system_cairo 0
%global system_harfbuzz 1
-# libvpx is too new for Waterfox 56
-%if 0%{?fedora} < 30
-%global system_libvpx 1
-%else
%global system_libvpx 0
-%endif
%global system_webp 1
%global system_libicu 0
%global system_jpeg 1
@@ -161,8 +156,8 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 2020.03.1
-Release: 12%{?branch:.%{branch}}%{?gver}%{?dist}
+Version: 2020.04
+Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -178,6 +173,8 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{bran
# rev=revision ./waterfox-FreeBSD-patches-snapshot.sh
# https://github.com/MrAlex94/Waterfox/issues/1220
Source600: https://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz
+Source601: patch-bug1321069
+Source602: patch-bug1381815
Source10: waterfox-mozconfig
Source12: bgstack15-%{name}-prefs.js
@@ -211,7 +208,6 @@ Patch224: mozilla-1170092.patch
Patch225: mozilla-1005640-accept-lang.patch
#ARM run-time patch
Patch226: rhbz-1354671.patch
-Patch230: rhbz-1497932.patch
# Firefox upstream patches
Patch402: mozilla-1196777.patch
@@ -419,7 +415,6 @@ This package contains results of tests executed during build.
%ifarch aarch64
%patch226 -p1 -b .1354671
%endif
-%patch230 -p1 -b .1497932
%patch402 -p1 -b .1196777
%patch406 -p1 -b .256180
@@ -445,6 +440,7 @@ This package contains results of tests executed during build.
# Prepare FreeBSD patches
mkdir _patches
cp -p %{freebsd_root}/patch-{bug,z-bug,revert-bug}* _patches/
+cp -pf %{S:601} %{S:602} _patches/
filterdiff -x dom/svg/crashtests/crashtests.list %{freebsd_root}/patch-bug1343147 \
> _patches/patch-bug1343147
@@ -463,14 +459,16 @@ done
# 3: no apply
# 4: uncertain
for i in \
- 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \
- 1395486 1427126 1430508 1433747 1452576 1453127 1454285 1466606 1469257 \
- 1384121 1388744 1413143 1415883 1437450 \
+ 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
+ 1401909 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
+ 1384121 1384701 1388744 1401063 1413143 1415883 1437450 \
1447519
do
rm -f _patches/patch-bug${i}
done
+rm -f _patches/patch-z-bug1355143
+
patchcommand='patch -p0 -s -i'
for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do
@@ -670,7 +668,7 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-RPM_SMP_MFLAGS_NCPUS=%(echo %{_smp_mflags} | sed 's|-j||')
+RPM_SMP_MFLAGS_NCPUS="%{?_smp_build_ncpus}%{!?_smp_build_ncpus:2}"
RPM_NCPUS=1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
@@ -1086,11 +1084,14 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Mar 19 2020 B Stack <bgstack15@gmail.com> - 2020.02.1-12.classic.20200313gitf6fe91c
+* Tue Apr 14 2020 B Stack <bgstack15@gmail.com> - 2020.04-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Thu Apr 09 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.04-1.classic
+- 2020.04
+
* Wed Mar 18 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.03.1-2.classic.20200313gitf6fe91c
- gcc 10 fix
bgstack15