diff options
| -rw-r--r-- | waterfox/0001-Update-patch-bug1456512.patch | 28 | ||||
| -rw-r--r-- | waterfox/0001-Update-patch-bug847568.patch | 29 | ||||
| -rw-r--r-- | waterfox/0001-mbft-tests-fix-build.patch | 24 | ||||
| -rw-r--r-- | waterfox/debian/changelog | 6 | ||||
| -rw-r--r-- | waterfox/debian/waterfox+devuan.dsc | 2 | ||||
| -rw-r--r-- | waterfox/mozilla-1389436.patch | 41 | ||||
| -rw-r--r-- | waterfox/mozilla-1516081.patch | 89 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 32 |
8 files changed, 148 insertions, 103 deletions
diff --git a/waterfox/0001-Update-patch-bug1456512.patch b/waterfox/0001-Update-patch-bug1456512.patch new file mode 100644 index 0000000..685fe04 --- /dev/null +++ b/waterfox/0001-Update-patch-bug1456512.patch @@ -0,0 +1,28 @@ +From 91e514c4c6e8cc3f770e9058b1864d7cf196d6af Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Fri, 20 Aug 2021 23:58:08 -0300 +Subject: [PATCH] Update patch-bug1456512 + +--- + _patches/patch-bug1456512 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/_patches/patch-bug1456512 b/_patches/patch-bug1456512 +index 4f52fe9..78a922b 100644 +--- a/_patches/patch-bug1456512 ++++ b/_patches/patch-bug1456512 +@@ -62,9 +62,9 @@ index c14f8bfc2005e..340287e8322e9 100644 + +++ js/src/gc/Heap.h + @@ -1381,7 +1381,7 @@ TenuredCell::readBarrier(TenuredCell* thing) + if (thing->isMarkedGray()) { +- // There shouldn't be anything marked grey unless we're on the active thread. ++ // There shouldn't be anything marked grey unless we're on the main thread. + MOZ_ASSERT(CurrentThreadCanAccessRuntime(thing->runtimeFromAnyThread())); +-- if (!RuntimeFromActiveCooperatingThreadIsHeapMajorCollecting(shadowZone)) ++- if (!RuntimeFromMainThreadIsHeapMajorCollecting(shadowZone)) + + if (!JS::CurrentThreadIsHeapCollecting()) + JS::UnmarkGrayGCThingRecursively(JS::GCCellPtr(thing, thing->getTraceKind())); + } +-- +2.31.1 + diff --git a/waterfox/0001-Update-patch-bug847568.patch b/waterfox/0001-Update-patch-bug847568.patch new file mode 100644 index 0000000..348266a --- /dev/null +++ b/waterfox/0001-Update-patch-bug847568.patch @@ -0,0 +1,29 @@ +From 9244b629a0a00a9e90019bb93fc217699cddb7d3 Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Fri, 20 Aug 2021 23:57:04 -0300 +Subject: [PATCH] Update patch-bug847568 + +--- + _patches/patch-bug847568 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/_patches/patch-bug847568 b/_patches/patch-bug847568 +index da3f3d6..ac4b962 100644 +--- a/_patches/patch-bug847568 ++++ b/_patches/patch-bug847568 +@@ -186,9 +186,9 @@ index 79c26e3e7001..c4d93bc5f7dc 100644 + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + + +- if CONFIG['ENABLE_INTL_API']: +- DEFINES['IDNA2008'] = True +- USE_LIBS += ['icu'] ++ USE_LIBS += ['icu'] ++ ++ if CONFIG['GNU_CXX']: + diff --git old-configure.in old-configure.in + index 95a58b634593..b614eef85c89 100644 + --- old-configure.in +-- +2.31.1 + diff --git a/waterfox/0001-mbft-tests-fix-build.patch b/waterfox/0001-mbft-tests-fix-build.patch new file mode 100644 index 0000000..b02dd62 --- /dev/null +++ b/waterfox/0001-mbft-tests-fix-build.patch @@ -0,0 +1,24 @@ +From 97ea3cead59c5599e90f04aeb046711887915a8f Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Fri, 20 Aug 2021 21:03:18 -0300 +Subject: [PATCH] mbft tests: fix build + +--- + mfbt/tests/TestUniquePtr.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp +index a207d9b..2952171 100644 +--- a/mfbt/tests/TestUniquePtr.cpp ++++ b/mfbt/tests/TestUniquePtr.cpp +@@ -13,6 +13,7 @@ + #include "mozilla/Vector.h" + + #include <stddef.h> ++#include <utility> + + using mozilla::DefaultDelete; + using mozilla::IsSame; +-- +2.31.1 + diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 2d4e714..73ff2a4 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2021.08-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack <bgstack15@gmail.com> Mon, 23 Aug 2021 10:29:09 -0400 + waterfox (2021.07-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index ab186da..21ca3b0 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: 2021.07-1+devuan +Version: 2021.08-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/mozilla-1389436.patch b/waterfox/mozilla-1389436.patch deleted file mode 100644 index b7a87d2..0000000 --- a/waterfox/mozilla-1389436.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# HG changeset patch -# User Mike Hommey <mh+mozilla@glandium.org> -# Date 1502455819 -32400 -# Node ID 97dae871389b7f22a7096a020781b07a5a61de58 -# Parent c73f64ef71d2d87f36008f5ff661f4050692bd06 -Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame - -diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp ---- a/gfx/thebes/gfxFont.cpp -+++ b/gfx/thebes/gfxFont.cpp -@@ -2634,16 +2634,28 @@ gfxFont::GetShapedWord(DrawTarget *aDraw - ShapeText(aDrawTarget, aText, 0, aLength, aRunScript, aVertical, - aRounding, sw); - - NS_WARNING_ASSERTION(ok, "failed to shape word - expect garbled text"); - - return sw; - } - -+template gfxShapedWord* -+gfxFont::GetShapedWord(DrawTarget *aDrawTarget, -+ const uint8_t *aText, -+ uint32_t aLength, -+ uint32_t aHash, -+ Script aRunScript, -+ bool aVertical, -+ int32_t aAppUnitsPerDevUnit, -+ gfx::ShapedTextFlags aFlags, -+ RoundingFlags aRounding, -+ gfxTextPerfMetrics *aTextPerf); -+ - bool - gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const - { - const gfxShapedWord* sw = mShapedWord.get(); - if (!sw) { - return false; - } - if (sw->GetLength() != aKey->mLength || - diff --git a/waterfox/mozilla-1516081.patch b/waterfox/mozilla-1516081.patch index f840432..b9a6ec6 100644 --- a/waterfox/mozilla-1516081.patch +++ b/waterfox/mozilla-1516081.patch @@ -1,28 +1,36 @@ -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/js/src/old-configure.in.1516081 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/js/src/old-configure.in ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/js/src/old-configure.in.1516081 2018-12-17 10:39:21.000000000 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/js/src/old-configure.in 2019-01-08 11:37:40.962313001 -0200 -@@ -1829,7 +1829,7 @@ dnl Test for profiling options - dnl Under gcc 3.4+, use -fprofile-generate/-fprofile-use - - _SAVE_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" -+CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction -DMOZ_PROFILE_INSTRUMENTATION" - - AC_MSG_CHECKING([whether C compiler supports -fprofile-generate]) - AC_TRY_COMPILE([], [return 0;], -@@ -1839,7 +1839,7 @@ AC_MSG_RESULT([$result]) - - if test $result = "yes"; then - PROFILE_GEN_LDFLAGS="-fprofile-generate" -- PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch" -+ PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -DMOZ_PROFILE_INSTRUMENTATION" - PROFILE_USE_LDFLAGS="-fprofile-use" - fi +From f652a5490a2fb0774f21a5c5bfd48f0ef40c412c 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 + +--- + build/moz.configure/toolchain.configure | 4 ++-- + nsprpub/configure.in | 4 ++-- + toolkit/components/terminator/nsTerminator.cpp | 7 +++++++ + 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 +--- 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'): + return namespace( +- gen_cflags=['-fprofile-generate'], ++ gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'], + gen_ldflags=['-fprofile-generate'], + use_cflags=['-fprofile-use', '-fprofile-correction', +- '-Wcoverage-mismatch'], ++ '-Wcoverage-mismatch', '-DMOZ_PROFILE_INSTRUMENTATION'], + use_ldflags=['-fprofile-use'], + ) -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in.1516081 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in.1516081 2018-12-17 10:39:21.000000000 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in 2019-01-08 11:37:49.866304640 -0200 -@@ -756,7 +756,7 @@ dnl Test for profiling options +diff --git a/nsprpub/configure.in b/nsprpub/configure.in +index b82dfa5..de8d88f 100644 +--- a/nsprpub/configure.in ++++ b/nsprpub/configure.in +@@ -740,7 +740,7 @@ dnl Test for profiling options dnl Under gcc 3.4+, use -fprofile-generate/-fprofile-use _SAVE_CFLAGS="$CFLAGS" @@ -31,7 +39,7 @@ diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in. AC_MSG_CHECKING([whether C compiler supports -fprofile-generate]) AC_TRY_COMPILE([], [return 0;], -@@ -766,7 +766,7 @@ AC_MSG_RESULT([$result]) +@@ -750,7 +750,7 @@ AC_MSG_RESULT([$result]) if test $result = "yes"; then PROFILE_GEN_LDFLAGS="-fprofile-generate" @@ -40,30 +48,10 @@ diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/nsprpub/configure.in. PROFILE_USE_LDFLAGS="-fprofile-use" fi -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/old-configure.in.1516081 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/old-configure.in ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/old-configure.in.1516081 2018-12-17 10:39:21.000000000 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/old-configure.in 2019-01-08 11:38:01.282293920 -0200 -@@ -4219,7 +4219,7 @@ dnl Test for profiling options - dnl Under gcc 3.4+, use -fprofile-generate/-fprofile-use - - _SAVE_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" -+CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction -DMOZ_PROFILE_INSTRUMENTATION" - - AC_MSG_CHECKING([whether C compiler supports -fprofile-generate]) - AC_TRY_COMPILE([], [return 0;], -@@ -4229,7 +4229,7 @@ AC_MSG_RESULT([$result]) - - if test $result = "yes"; then - PROFILE_GEN_LDFLAGS="-fprofile-generate" -- PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch" -+ PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -DMOZ_PROFILE_INSTRUMENTATION" - PROFILE_USE_LDFLAGS="-fprofile-use" - fi - -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/toolkit/components/terminator/nsTerminator.cpp.1516081 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/toolkit/components/terminator/nsTerminator.cpp ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/toolkit/components/terminator/nsTerminator.cpp.1516081 2018-12-17 10:39:21.000000000 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/toolkit/components/terminator/nsTerminator.cpp 2019-01-08 11:38:52.969192841 -0200 +diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp +index e72335f..eb70f15 100644 +--- a/toolkit/components/terminator/nsTerminator.cpp ++++ b/toolkit/components/terminator/nsTerminator.cpp @@ -389,6 +389,13 @@ nsTerminator::StartWatchdog() crashAfterMS += ADDITIONAL_WAIT_BEFORE_CRASH_MS; } @@ -78,3 +66,6 @@ diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/toolkit/components/te UniquePtr<Options> options(new Options()); const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000); options->crashAfterTicks = crashAfterMS / ticksDuration; +-- +2.31.1 + diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 0c3358a..a987fb3 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -166,12 +166,12 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.07 +Version: 2021.08 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ -%global vc_url https://github.com/MrAlex94/Waterfox +%global vc_url https://github.com/WaterfoxCo/Waterfox %if 0%{?with_snapshot} Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else @@ -181,11 +181,11 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{bran # FreeBSD patches # https://www.freshports.org/www/waterfox # rev=revision ./waterfox-FreeBSD-patches-snapshot.sh -# https://github.com/MrAlex94/Waterfox/issues/1220 +# https://github.com/WaterfoxCo/Waterfox/issues/1220 # 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 +Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/waterfox/%{freebsd_root}.tar.xz/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz Source601: patch-bug1321069 Source602: patch-bug1381815 @@ -227,12 +227,10 @@ Patch402: mozilla-1196777.patch Patch413: mozilla-1353817.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch -Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mozilla-1389436.patch # Upstream updates/PRs/Reverts #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -Patch450: %{vc_url}/commit/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch#/%{name}-gh-26459c4.patch # Debian patches Patch500: mozilla-440908.patch @@ -246,12 +244,15 @@ Patch604: 1003_gentoo_specific_pgo.patch # Chinforinfula patches Patch700: %{name}-nolangpacks.patch -# https://github.com/MrAlex94/Waterfox/pull/547.patch, down +# 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 # Gentoo Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch @@ -445,7 +446,6 @@ This package contains results of tests executed during build. %patch415 -p1 -b .mozilla-1238661 %endif %patch419 -p1 -b .mozilla-1320560 -%patch420 -p1 -b .mozilla-1389436 # Debian extension patch %patch500 -p1 -b .440908 @@ -463,6 +463,8 @@ cp -p %{freebsd_root}/patch-{bug,z-bug,revert-bug}* _patches/ cp -pf %{S:601} %{S:602} _patches/ %patch705 -p1 +%patch706 -p1 +%patch707 -p1 filterdiff -x dom/svg/crashtests/crashtests.list %{freebsd_root}/patch-bug1343147 \ > _patches/patch-bug1343147 @@ -484,14 +486,16 @@ done # 5: uncertain for i in \ 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \ - 1395486 1396722 1398021 1399412 1401909 1417751 1419762 1427126 1430508 1433747 \ - 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \ - 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \ + 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 \ 1447519 do rm -f _patches/patch-bug${i} done + rm -f _patches/patch-z-bug1355143 +rm -f _patches/patch-z-bug1461619 patchcommand='patch -p0 -s -i' @@ -506,6 +510,7 @@ done %patch702 -p1 -b .waterfoxdir-2 %patch703 -p1 -b .fix-testing-file %patch704 -p1 -b .no-diagnostics-color +%patch708 -p1 -b .mbft-build-fix # stackrpms,2 %if 0%{?system_libvpx} @@ -1116,11 +1121,14 @@ fi #--------------------------------------------------------------------- %changelog -* Sat Jul 17 2021 B. Stack <bgstack15@gmail.com> - 2021.07-11.classic +* Mon Aug 23 2021 B. Stack <bgstack15@gmail.com> - 2021.08-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Fri Aug 20 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.08-1.classic +- 2021.08 + * Sat Jul 17 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.07-1.classic - 2021.07 |