summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch44
-rw-r--r--waterfox/debian/changelog6
-rw-r--r--waterfox/waterfox.spec24
3 files changed, 69 insertions, 5 deletions
diff --git a/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch b/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch
new file mode 100644
index 0000000..75ec736
--- /dev/null
+++ b/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch
@@ -0,0 +1,44 @@
+From ad7c6089a18cd8ad66cd97135e3a9dabfccea9b9 Mon Sep 17 00:00:00 2001
+From: Phantom X <PhantomX@users.noreply.github.com>
+Date: Wed, 9 Mar 2022 17:46:25 -0300
+Subject: [PATCH] testStructuredClone.cpp: Remove
+ testStructuredClone_invalidLength test
+
+Build failure when debug is disabled
+This reverts part of commit 18213329b676e532f56b6042bc0baae1cec1d5d2,
+---
+ js/src/jsapi-tests/testStructuredClone.cpp | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/js/src/jsapi-tests/testStructuredClone.cpp b/js/src/jsapi-tests/testStructuredClone.cpp
+index 1a0fada..a01afcc 100644
+--- a/js/src/jsapi-tests/testStructuredClone.cpp
++++ b/js/src/jsapi-tests/testStructuredClone.cpp
+@@ -9,24 +9,6 @@
+
+ using namespace js;
+
+-#ifdef DEBUG
+-// Skip test, since it will abort with an assert in buf->Init(7).
+-#else
+-BEGIN_TEST(testStructuredClone_invalidLength) {
+- auto buf = js::MakeUnique<JSStructuredCloneData>(
+- JS::StructuredCloneScope::DifferentProcess);
+- CHECK(buf);
+- CHECK(buf->Init(7));
+- RootedValue clone(cx);
+- JS::CloneDataPolicy policy;
+- CHECK(!JS_ReadStructuredClone(cx, *buf, JS_STRUCTURED_CLONE_VERSION,
+- JS::StructuredCloneScope::DifferentProcess,
+- &clone, policy, nullptr, nullptr));
+- return true;
+-}
+-END_TEST(testStructuredClone_invalidLength)
+-#endif
+-
+ BEGIN_TEST(testStructuredClone_object)
+ {
+ JS::RootedObject g1(cx, createGlobal());
+--
+2.35.1
+
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 3b90e05..18ec2cd 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,9 @@
+waterfox (2022.04-1+devuan) obs; urgency=medium
+
+ - latest version
+
+ -- B. Stack <bgstack15@gmail.com> Wed, 01 Jun 2022 12:03:25 -0400
+
waterfox (2022.01-1+devuan) obs; urgency=medium
- latest version
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 096cf5b..ff70d48 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,4 +1,8 @@
%global _legacy_common_support 1
+%undefine _auto_set_build_flags
+
+# Disable this. Local lto flags in use.
+%global _lto_cflags %{nil}
%global commit 93fc15e9f2d68d8a43b22c57b8b935f272ce06eb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -166,7 +170,7 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox %{channel} Web browser
Name: waterfox
-Version: 2022.01
+Version: 2022.04
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://classic.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -251,6 +255,7 @@ Patch706: 0001-Update-patch-bug847568.patch
Patch707: 0001-Update-patch-bug1456512.patch
Patch708: 0001-mbft-tests-fix-build.patch
Patch709: 0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch
+Patch710: 0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch
# Gentoo
Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch
@@ -484,7 +489,7 @@ for i in \
702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \
1395486 1396722 1398021 1399412 1401909 1412420 1417751 1419762 1425267 1427126 \
1430508 1433747 1438425 1440943 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \
- 712130 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 1464872 1465108 \
+ 712130 1384121 1384701 1388744 1401063 1406396 1408397 1413143 1415883 1402442 1437450 1464872 1465108 \
1447519
do
rm -f _patches/patch-bug${i}
@@ -508,6 +513,7 @@ done
%patch704 -p1 -b .no-diagnostics-color
%patch708 -p1 -b .mbft-build-fix
%patch709 -p1 -b .TestAudioEventTimeline.cpp-build-fix
+%patch710 -p1 -b .testStructuredClone.cpp-build-fix
# stackrpms,2
%if 0%{?system_libvpx}
@@ -677,12 +683,14 @@ echo "ac_add_options --disable-eme" >> .mozconfig
# Remove executable bit to make brp-mangle-shebangs happy.
chmod -x third_party/rust/itertools/src/lib.rs
+find \
+ dom/plugins gfx/{skia,layers,gl} intl/icu/source/i18n \
+ js/src/wasm media/webrtc netwerk/sctp xpcom/threads \
+ -type f \( -name '*.c*' -o -name '*.h' \) -exec chmod -x {} ';'
#---------------------------------------------------------------------
%build
-# Disable this. Local lto flags in use.
-%global _lto_cflags %{nil}
%if 0%{?system_sqlite}
# Do not proceed with build if the sqlite require would be broken:
@@ -1118,11 +1126,17 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Feb 10 2022 B. Stack <bgstack15@gmail.com> - 2022.01-11.classic
+* Wed Jun 01 2022 B. Stack <bgstack15@gmail.com> - 2022.04-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Tue Apr 19 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.04-1.classic
+- 2022.04
+
+* Wed Mar 09 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.02-1.classic
+- 2022.02
+
* Thu Jan 20 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.01-1.classic
- 2022.01
bgstack15