waterfox 2021.08

1 files changed, 40 insertions, 49 deletions

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
+