summaryrefslogtreecommitdiff
path: root/waterfox/waterfox.spec
diff options
context:
space:
mode:
Diffstat (limited to 'waterfox/waterfox.spec')
-rw-r--r--waterfox/waterfox.spec33
1 files changed, 23 insertions, 10 deletions
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 555837b..b7d6799 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 2021.04.2
+Version: 2021.06
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -175,14 +175,17 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
%if 0%{?with_snapshot}
Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
%else
-Source0: %{vc_url}/archive/%{version}/%{name}-%{version}-%{branch}.tar.gz
+Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz
%endif
# FreeBSD patches
# https://www.freshports.org/www/waterfox
# 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
+# stackrpms, 4
+# for revision freebsd_rev 20191102 we need to use somewhere else because the dl.bintray.com file is not available to me
+# found in builder-live.log.gz from chinfo copr waterfox build
+Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/waterfox/%{freebsd_root}.tar.xz/md5/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz
Source601: patch-bug1321069
Source602: patch-bug1381815
@@ -253,6 +256,7 @@ Patch705: 0001-Update-patch-bug1403998.patch
# Gentoo
Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch
+Patch801: seamonkey-2.53.7.1-CLEANUP-workaround.patch
%if 0%{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
@@ -315,6 +319,7 @@ BuildRequires: nasm >= 2.13
BuildRequires: yasm
BuildRequires: llvm
BuildRequires: llvm-devel
+# clang is needed even with gcc
%if !0%{?el7}
BuildRequires: clang
BuildRequires: clang-libs
@@ -396,7 +401,7 @@ This package contains results of tests executed during build.
%if 0%{?with_snapshot}
%setup -q -n Waterfox-%{commit} -a 600
%else
-%setup -q -n Waterfox-%{version} -a 600
+%setup -q -n Waterfox-%{version}-%{branch} -a 600
%endif
%if %{build_langpacks}
@@ -475,23 +480,26 @@ for i in 1404057 1404324 1404180 1405878 ;do
%{freebsd_root}/patch-bug${i} > _patches/patch-bug${i}
done
+# Remove patches that don't apply before batch
# 1: unneeded
# 2: unneeded
-# 3: no apply
-# 4: uncertain
+# 3: unneeded
+# 4: no apply
+# 5: uncertain
for i in \
- 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
- 1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
+ 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \
+ 1395486 1396722 1398021 1399412 1401909 1419762 1427126 1430508 1433747 \
+ 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \
1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \
1447519
do
rm -f _patches/patch-bug${i}
done
-
rm -f _patches/patch-z-bug1355143
patchcommand='patch -p0 -s -i'
+# Patch batch
for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do
${patchcommand} ${i}
done
@@ -508,6 +516,7 @@ done
%patch800 -p2 -b .system-vpx
# stackrpms,2
%endif
+%patch801 -p1 -b .CLEANUP-workaround
# Patch for big endian platforms only
%if 0%{?big_endian}
@@ -748,6 +757,7 @@ export MOZ_DEBUG_FLAGS=" "
%if 0%{?build_with_lto}
MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/ -g\b/ -g1/')"
%if 0%{?build_with_clang}
+# stackrpms,2 fix typo of second double-quote mark at end
RPM_FLTO_FLAGS="-flto=thin -Wl,--thinlto-jobs=$RPM_NCPUS -Wl,-plugin-opt=-import-instr-limit=10"
%else
RPM_FLTO_FLAGS="-flto=$RPM_NCPUS -flifetime-dse=1"
@@ -1110,11 +1120,14 @@ fi
#---------------------------------------------------------------------
%changelog
-* Tue Apr 27 2021 B. Stack <bgstack15@gmail.com> - 2021.04.2-11.classic
+* Tue Jun 15 2021 B. Stack <bgstack15@gmail.com> - 2021.06-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Mon Jun 07 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.06-1.classic
+- 2021.06
+
* Mon Apr 26 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.04.2-1.classic
- 2021.04.2
bgstack15