diff options
| -rw-r--r-- | waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch | 34 | ||||
| -rw-r--r-- | waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch | 10 | ||||
| -rw-r--r-- | waterfox/1003_gentoo_specific_pgo.patch | 6 | ||||
| -rw-r--r-- | waterfox/debian/changelog | 6 | ||||
| -rw-r--r-- | waterfox/debian/waterfox+devuan.dsc | 2 | ||||
| -rw-r--r-- | waterfox/mozilla-1516081.patch | 12 | ||||
| -rw-r--r-- | waterfox/mozilla-1516803.patch | 31 | ||||
| -rw-r--r-- | waterfox/pgo.patch | 2 | ||||
| -rw-r--r-- | waterfox/waterfox-fix-testing-file.patch | 42 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 18 |
10 files changed, 50 insertions, 113 deletions
diff --git a/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch b/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch deleted file mode 100644 index abb11b0..0000000 --- a/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81d8dbb800b7aa396b6b0a57add39c7e86d7f306 Mon Sep 17 00:00:00 2001 -From: Phantom X <PhantomX@users.noreply.github.com> -Date: Sun, 19 Sep 2021 16:55:00 -0300 -Subject: [PATCH] TestAudioEventTimeline.h gtest: fix build - ---- - dom/media/webaudio/gtest/TestAudioEventTimeline.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp b/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp -index da7c4c4..b79afa5 100644 ---- a/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp -+++ b/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp -@@ -9,17 +9,6 @@ - #include <limits> - #include "gtest/gtest.h" - --// Mock the MediaStream class --namespace mozilla { --class MediaStream --{ -- NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream) --private: -- ~MediaStream() { -- }; --}; --} -- - using namespace mozilla; - using namespace mozilla::dom; - using std::numeric_limits; --- -2.31.1 - diff --git a/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch b/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch index 75ec736..f82eee5 100644 --- a/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch +++ b/waterfox/0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch @@ -14,7 +14,7 @@ diff --git a/js/src/jsapi-tests/testStructuredClone.cpp b/js/src/jsapi-tests/tes index 1a0fada..a01afcc 100644 --- a/js/src/jsapi-tests/testStructuredClone.cpp +++ b/js/src/jsapi-tests/testStructuredClone.cpp -@@ -9,24 +9,6 @@ +@@ -9,22 +9,6 @@ using namespace js; @@ -22,15 +22,13 @@ index 1a0fada..a01afcc 100644 -// 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); +- auto buf = js::MakeUnique<JSStructuredCloneData>(0, 0, 7); - CHECK(buf); -- CHECK(buf->Init(7)); +- CHECK(buf->Init(0, 7)); - RootedValue clone(cx); -- JS::CloneDataPolicy policy; - CHECK(!JS_ReadStructuredClone(cx, *buf, JS_STRUCTURED_CLONE_VERSION, - JS::StructuredCloneScope::DifferentProcess, -- &clone, policy, nullptr, nullptr)); +- &clone, nullptr, nullptr)); - return true; -} -END_TEST(testStructuredClone_invalidLength) diff --git a/waterfox/1003_gentoo_specific_pgo.patch b/waterfox/1003_gentoo_specific_pgo.patch index 88e4b69..6096e29 100644 --- a/waterfox/1003_gentoo_specific_pgo.patch +++ b/waterfox/1003_gentoo_specific_pgo.patch @@ -10,7 +10,7 @@ diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -50,16 +50,19 @@ ifndef MOZ_PROFILE_USE - ifndef JS_STANDALONE + ifdef MOZ_WIDGET_TOOLKIT ifdef COMPILE_ENVIRONMENT $(TIERS) binaries:: $(topsrcdir)/js/src/configure js/src/config.status endif @@ -27,5 +27,5 @@ diff --git a/Makefile.in b/Makefile.in else CLOBBER: $(topsrcdir)/CLOBBER @echo 'STOP! The CLOBBER file has changed.' - @echo 'Please run the build through a sanctioned build wrapper, such as' - @echo '"mach build" or client.mk.' + @echo 'Please run the build through "mach build".' + @exit 1 diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 18ec2cd..117df4c 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2022.06-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack <bgstack15@gmail.com> Tue, 19 Jul 2022 09:29:03 -0400 + waterfox (2022.04-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index f4f0329..3b03768 100644 --- a/waterfox/debian/waterfox+devuan.dsc +++ b/waterfox/debian/waterfox+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: waterfox Binary: waterfox Architecture: any -Version: 2022.01-1+devuan +Version: 2022.06-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/mozilla-1516081.patch b/waterfox/mozilla-1516081.patch index b9a6ec6..f295ebb 100644 --- a/waterfox/mozilla-1516081.patch +++ b/waterfox/mozilla-1516081.patch @@ -1,4 +1,4 @@ -From f652a5490a2fb0774f21a5c5bfd48f0ef40c412c Mon Sep 17 00:00:00 2001 +From cbdcb6c54ea3f533d5d86ea5a6fffcfb8f54e743 Mon Sep 17 00:00:00 2001 From: Phantom X <PhantomX@users.noreply.github.com> Date: Fri, 20 Aug 2021 19:33:56 -0300 Subject: [PATCH] Mozilla 1516081 rebase for Waterfox @@ -10,12 +10,12 @@ Subject: [PATCH] Mozilla 1516081 rebase for Waterfox 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 98b1ee6..2b889d7 100755 +index af458a2..7dfec46 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -1157,10 +1157,10 @@ set_config('VISIBILITY_FLAGS', visibility_flags) - def pgo_flags(compiler): - if compiler.type in ('gcc', 'clang'): +@@ -1195,10 +1195,10 @@ def pgo_flags(compiler, build_env, target): + + if compiler.type == 'gcc': return namespace( - gen_cflags=['-fprofile-generate'], + gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'], @@ -67,5 +67,5 @@ index e72335f..eb70f15 100644 const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000); options->crashAfterTicks = crashAfterMS / ticksDuration; -- -2.31.1 +2.36.1 diff --git a/waterfox/mozilla-1516803.patch b/waterfox/mozilla-1516803.patch index e46f891..7894a84 100644 --- a/waterfox/mozilla-1516803.patch +++ b/waterfox/mozilla-1516803.patch @@ -1,14 +1,25 @@ -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/security/sandbox/linux/moz.build.1516803 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/security/sandbox/linux/moz.build ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/security/sandbox/linux/moz.build.1516803 2019-01-08 11:39:44.002864753 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/security/sandbox/linux/moz.build 2019-01-08 11:40:38.624513603 -0200 -@@ -98,8 +98,8 @@ if CONFIG['GNU_CXX']: - # gcc lto likes to put the top level asm in syscall.cc in a different partition - # from the function using it which breaks the build. Work around that by +From 00a5d2a38bac63aca5c83fadd5fb5fbcb43fe21a Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Fri, 8 Jul 2022 16:10:43 -0300 +Subject: [PATCH] Mozilla 1516083 rebase for Waterfox + +--- + security/sandbox/linux/moz.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build +index d12ca8e..5997167 100644 +--- a/security/sandbox/linux/moz.build ++++ b/security/sandbox/linux/moz.build +@@ -101,7 +101,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): # forcing there to be only one partition. --if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']: -- LDFLAGS += ['--param lto-partitions=1'] -+if CONFIG['CC_TYPE'] != 'clang': -+ LDFLAGS += ['--param', 'lto-partitions=1'] + for f in CONFIG['OS_CXXFLAGS']: + if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang': +- LDFLAGS += ['--param lto-partitions=1'] ++ LDFLAGS += ['--param', 'lto-partitions=1'] DEFINES['NS_NO_XPCOM'] = True DisableStlWrapping() +-- +2.36.1 + diff --git a/waterfox/pgo.patch b/waterfox/pgo.patch index 21776b7..5b6e746 100644 --- a/waterfox/pgo.patch +++ b/waterfox/pgo.patch @@ -22,7 +22,7 @@ diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/extensions/spellcheck +++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/extensions/spellcheck/src/moz.build 2019-01-08 11:27:26.673823140 -0200 @@ -32,3 +32,5 @@ EXPORTS.mozilla += [ - if CONFIG['GNU_CXX']: + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] + +CXXFLAGS += ['-fno-devirtualize'] diff --git a/waterfox/waterfox-fix-testing-file.patch b/waterfox/waterfox-fix-testing-file.patch deleted file mode 100644 index 69f9e48..0000000 --- a/waterfox/waterfox-fix-testing-file.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ./testing/web-platform/meta/MANIFEST.json.fix-testing-file 2019-03-14 09:55:07.880590923 -0300 -+++ ./testing/web-platform/meta/MANIFEST.json 2019-03-14 09:58:05.190243977 -0300 -@@ -332313,15 +332313,15 @@ - {} - ] - ], --<<<<<<< HEAD - "cssom-view/scrollIntoView-empty-args.html": [ - [ - "/cssom-view/scrollIntoView-empty-args.html", --======= -+ {} -+ ] -+ ], - "cssom-view/offsetTopLeftInScrollableParent.html": [ - [ - "/cssom-view/offsetTopLeftInScrollableParent.html", -->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly - {} - ] - ], -@@ -569554,12 +569554,10 @@ - "b2261ec702116c211ab5ac6fbb53698dfe60a7be", - "testharness" - ], --<<<<<<< HEAD - "cssom-view/scrollIntoView-empty-args.html": [ - "c1bd398158cc935c8c69cb0291c2ef0e0faa6bad", - "testharness" - ], --======= - "cssom-view/offsetTopLeftInScrollableParent.html": [ - "79b4a278f0e35646cfdffeebf8f0523e2772bc9b", - "testharness" -@@ -569580,7 +569578,6 @@ - "987051cdbad355cbb1bbb8ea1030a3b17e533f09", - "manual" - ], -->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly - "cssom-view/scrollIntoView-shadow.html": [ - "3c4a18992105fd7bf19cbf29f0b6d80cb12ca98c", - "testharness" diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index ff70d48..c996f04 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -170,7 +170,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox %{channel} Web browser Name: waterfox -Version: 2022.04 +Version: 2022.06 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://classic.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -248,13 +248,11 @@ Patch700: %{name}-nolangpacks.patch # https://github.com/WaterfoxCo/Waterfox/pull/547.patch, down Patch701: %{name}-waterfoxdir-1.patch Patch702: %{name}-waterfoxdir-2.patch -Patch703: %{name}-fix-testing-file.patch Patch704: %{name}-disable-diagnostics-color.patch Patch705: 0001-Update-patch-bug1403998.patch 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 @@ -455,7 +453,7 @@ This package contains results of tests executed during build. %patch600 -p1 -b .pgo %patch601 -p1 -b .1516081 %patch602 -p1 -b .1516803 -%patch603 -p1 -b .1397365 +%dnl %patch603 -p1 -b .1397365 %patch604 -p1 -b .gentoo_pgo # Prepare FreeBSD patches @@ -487,8 +485,8 @@ done # 5: uncertain 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 \ + 1395486 1396722 1398021 1399412 1401909 1411415 1412420 1417751 1418894 1419762 1425267 1427126 \ + 1430508 1433747 1438425 1438645 1440943 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \ 712130 1384121 1384701 1388744 1401063 1406396 1408397 1413143 1415883 1402442 1437450 1464872 1465108 \ 1447519 do @@ -509,10 +507,8 @@ done %patch700 -p1 -b .nolangpacks %patch701 -p1 -b .waterfoxdir-1 %patch702 -p1 -b .waterfoxdir-2 -%patch703 -p1 -b .fix-testing-file %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 @@ -691,7 +687,6 @@ find \ #--------------------------------------------------------------------- %build - %if 0%{?system_sqlite} # Do not proceed with build if the sqlite require would be broken: # make sure the minimum requirement is non-empty, ... @@ -1126,11 +1121,14 @@ fi #--------------------------------------------------------------------- %changelog -* Wed Jun 01 2022 B. Stack <bgstack15@gmail.com> - 2022.04-11.classic +* Tue Jul 19 2022 B. Stack <bgstack15@gmail.com> - 2022.06-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Fri Jul 08 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.06-1.classic +- 2022.06 + * Tue Apr 19 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.04-1.classic - 2022.04 |