Merge branch 'waterfox-bump' into 'master'

Waterfox 2020.06

See merge request bgstack15/stackrpms!160

8 files changed, 249 insertions, 147 deletions

diff --git a/waterfox/README.md b/waterfox/README.md
index 642c136..11400d5 100644
--- a/waterfox/README.md
+++ b/waterfox/README.md
@@ -17,6 +17,7 @@ All        | 2020.01-classic
 
 # Additional info
 * 2020-03-19 [https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md](https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md) is where the rpm scriptlet `_legacy_common_support 1` comes from, for telling gcc 10 to use `-fcommon`
+* [https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage](https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage)
 
 # Differences from upstream
 ## rpm
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 368d383..3ad3d94 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,15 @@
+waterfox (2020.06-1+devuan) obs; urgency=medium
+
+  - Latest security advisories patched (best effort)*
+  - Various website compatibilty changes (Thanks to
+    [hawkeye116477](https://github.com/MrAlex94/Waterfox/issues?q=is%3Apr+author%3Ahawkeye116477))
+    * JavaScript globalThis implemented
+    * Fix for WebAudio
+    * Partial Shadow DOM v1 support (experimental)
+    * Fix for some crashes
+
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 04 Jun 2020 13:54:57 -0400
+
 waterfox (2020.05-1+devuan) obs; urgency=medium
 
   - Latest security advisories patched (best effort)*
diff --git a/waterfox/debian/control b/waterfox/debian/control
index 9ef1463..d272dd3 100644
--- a/waterfox/debian/control
+++ b/waterfox/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 12),
    binutils-avr,
    cargo (>= 0.35),
    ccache,
-   clang-6.0,
+   clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7,
    dpkg-dev (>= 1.16.1.1~),
-   libasound2-dev, 
+   libasound2-dev,
    libbz2-dev,
-   libclang-6.0-dev,
+   libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev,
    libdbus-glib-1-dev,
    libevent-dev (>= 1.4.1),
    libfontconfig-dev,
@@ -31,9 +31,9 @@ Build-Depends: debhelper (>= 12),
    libx11-dev,
    libx11-xcb-dev,
    libxt-dev,
-   llvm-6.0-dev,
+   llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev,
    locales,
-   lsb-release, 
+   lsb-release,
    python2.7,
    python-minimal (>= 2.6.6-13~),
    python-ply,
diff --git a/waterfox/debian/mozconfig b/waterfox/debian/mozconfig
index 0b6416a..e9f4bb6 100644
--- a/waterfox/debian/mozconfig
+++ b/waterfox/debian/mozconfig
@@ -1,5 +1,5 @@
-export CC=clang-6.0
-export CXX=clang++-6.0
+export CC=clang
+export CXX=clang++
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-optimize="-O2"
diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc
index 9c46b6b..925c156 100644
--- a/waterfox/debian/waterfox_devuan.dsc
+++ b/waterfox/debian/waterfox_devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: waterfox
 Binary: waterfox
 Architecture: any
-Version: 2020.05-1+devuan
+Version: 2020.06-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://www.waterfox.net/
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang-6.0, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-6.0-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-6.0-dev, locales, lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev
+Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev
 Package-List:
  waterfox deb web optional arch=any
 Files:
diff --git a/waterfox/stackrpms-2019-03-06.diff b/waterfox/stackrpms-2019-03-06.diff
deleted file mode 100644
index f05d9fd..0000000
--- a/waterfox/stackrpms-2019-03-06.diff
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini
---- chinforpms/waterfox/distribution.ini	2018-11-05 14:29:34.793145640 -0500
-+++ stackrpms/waterfox/distribution.ini	2019-01-15 11:12:47.458208372 -0500
-@@ -1,9 +1,9 @@
- [Global]
--id=chinforpms
-+id=stackrpms
- version=1.0
- about=Waterfox for Fedora
- 
- [Preferences]
--app.distributor=chinforpms
--app.distributor.channel=chinforpms
--app.partner.fedora=chinforpms
-+app.distributor=stackrpms
-+app.distributor.channel=stackrpms
-+app.partner.fedora=stackrpms
-diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/issue2947383002_1.diff stackrpms/waterfox/issue2947383002_1.diff
---- chinforpms/waterfox/issue2947383002_1.diff	2018-11-05 14:29:34.794145647 -0500
-+++ stackrpms/waterfox/issue2947383002_1.diff	1969-12-31 19:00:00.000000000 -0500
-@@ -1,60 +0,0 @@
--Index: webrtc/common_audio/vad/vad_core.c
--diff --git a/webrtc/common_audio/vad/vad_core.c b/webrtc/common_audio/vad/vad_core.c
--index 0340165eb5050ec9fbc386f6d373d0d90a4868f1..1a3889c36787f7bf993692e8fe7781c2ae35e2c2 100644
----- a/webrtc/common_audio/vad/vad_core.c
--+++ b/webrtc/common_audio/vad/vad_core.c
--@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset,
-- // undefined behavior, so not a good idea; this just makes UBSan ignore the
-- // violation, so that our old code can continue to do what it's always been
-- // doing.)
---static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b)
---    RTC_NO_SANITIZE("signed-integer-overflow") {
--+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
--+    OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) {
--   return a * b;
-- }
-- 
--Index: webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
--diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
--index 039bbc8af7ec26e286dfc94b4383428e5e6e863b..dc8bcf3f481012caab8718430aa9242cf91ad480 100644
----- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
--+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
--@@ -193,16 +193,16 @@ static void CalcCorrelation(int32_t *PSpecQ12, int32_t *CorrQ7)
-- // undefined behavior, so not a good idea; this just makes UBSan ignore the
-- // violations, so that our old code can continue to do what it's always been
-- // doing.)
---static inline int32_t OverflowingMulS16S32ToS32(int16_t a, int32_t b)
---    RTC_NO_SANITIZE("signed-integer-overflow") {
--+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
--+    OverflowingMulS16S32ToS32(int16_t a, int32_t b) {
--   return a * b;
-- }
---static inline int32_t OverflowingAddS32S32ToS32(int32_t a, int32_t b)
---    RTC_NO_SANITIZE("signed-integer-overflow") {
--+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
--+    OverflowingAddS32S32ToS32(int32_t a, int32_t b) {
--   return a + b;
-- }
---static inline int32_t OverflowingSubS32S32ToS32(int32_t a, int32_t b)
---    RTC_NO_SANITIZE("signed-integer-overflow") {
--+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
--+    OverflowingSubS32S32ToS32(int32_t a, int32_t b) {
--   return a - b;
-- }
-- 
--Index: webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
--diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
--index 2b92acb64a3d7dd268574abb57a24850b60cb3d1..b69a885f34de9eaa762a69f11d84cc8bec637376 100644
----- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
--+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
--@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef,
-- // Left shift of an int32_t that's allowed to overflow. (It's still undefined
-- // behavior, so not a good idea; this just makes UBSan ignore the violation, so
-- // that our old code can continue to do what it's always been doing.)
---static inline int32_t OverflowingLShiftS32(int32_t x, int shift)
---    RTC_NO_SANITIZE("shift") {
--+static inline int32_t RTC_NO_SANITIZE("shift")
--+    OverflowingLShiftS32(int32_t x, int shift) {
--   return x << shift;
-- }
-- 
-diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch
---- chinforpms/waterfox/waterfox-cubeb-build.patch	2018-11-05 14:29:34.795145654 -0500
-+++ stackrpms/waterfox/waterfox-cubeb-build.patch	1969-12-31 19:00:00.000000000 -0500
-@@ -1,8 +0,0 @@
----- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild	2018-01-05 16:39:00.921101411 -0200
--+++ Waterfox-56.0.2/media/libcubeb/src/moz.build	2018-01-05 16:40:44.948718748 -0200
--@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
-- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
-- 
-- # We allow warnings for third-party code that can be updated from upstream.
---AllowCompilerWarnings()
--+ALLOW_COMPILER_WARNINGS = True
-diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig
---- chinforpms/waterfox/waterfox-mozconfig	2019-01-15 11:35:07.704294765 -0500
-+++ stackrpms/waterfox/waterfox-mozconfig	2019-01-17 07:54:36.258797151 -0500
-@@ -41,4 +41,4 @@
- ac_add_options --with-app-name=waterfox
- ac_add_options --with-app-basename=Waterfox
- ac_add_options --with-branding=browser/branding/unofficial
--ac_add_options --with-distribution-id=chinforpms
-+ac_add_options --with-distribution-id=stackrpms
-diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec
---- chinforpms/waterfox/waterfox.spec	2019-03-06 07:48:49.852601972 -0500
-+++ stackrpms/waterfox/waterfox.spec	2019-03-06 08:29:09.565750261 -0500
-@@ -91,7 +91,8 @@
- %global webp_version 1.0.0
- %endif
- %if 0%{?system_vorbis}
--%global ogg_version 1.3.3
-+# decrease this to fc28 libogg version and hope it works 2018-09-14
-+%global ogg_version 1.3.2
- %global vorbis_version 1.3.5
- %endif
- 
-@@ -119,7 +120,7 @@
- Summary:        Waterfox Web browser
- Name:           waterfox
- Version:        56.2.7.1
--Release:        2%{?gver}%{?dist}
-+Release:        3%{?gver}%{?dist}
- URL:            https://www.waterfoxproject.org
- License:        MPLv1.1 or GPLv2+ or LGPLv2+
- 
-@@ -992,6 +993,9 @@
- #---------------------------------------------------------------------
- 
- %changelog
-+* Wed Mar  6 2019 B Stack <bgstack15@gmail.com> - 56.2.7.1-3.20190201gitf367fd2
-+- repackage for stackrpms
-+
- * Wed Feb 13 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-2.20190201gitf367fd2
- - LTO and fixes to build with it
- 
diff --git a/waterfox/stackrpms-2020-06-04.diff b/waterfox/stackrpms-2020-06-04.diff
new file mode 100644
index 0000000..5d8da37
--- /dev/null
+++ b/waterfox/stackrpms-2020-06-04.diff
@@ -0,0 +1,220 @@
+Message: This is the differences between the chinforpms srpm tree and stackrpms srpm tree. The cubeb file appears to have never been cleaned up by PhantomX.
+Date: 2020-06-04
+Author: bgstack15
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini
+--- chinforpms/waterfox/distribution.ini	2020-03-16 14:17:56.196146446 -0400
++++ stackrpms/waterfox/distribution.ini	2020-03-04 16:08:26.578716330 -0500
+@@ -1,9 +1,9 @@
+ [Global]
+-id=chinforpms
++id=stackrpms
+ version=1.0
+ about=Waterfox _BRANCH_ for Fedora
+ 
+ [Preferences]
+-app.distributor=chinforpms
+-app.distributor.channel=chinforpms
+-app.partner.fedora=chinforpms
++app.distributor=stackrpms
++app.distributor.channel=stackrpms
++app.partner.fedora=stackrpms
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/.gitignore stackrpms/waterfox/.gitignore
+--- chinforpms/waterfox/.gitignore	2020-03-16 14:17:56.196146446 -0400
++++ stackrpms/waterfox/.gitignore	2020-03-04 16:08:26.575716294 -0500
+@@ -1 +1,2 @@
+-/waterfox-gh-*.patch
++/FreeBSD-*.patch
++/wf-*.patch
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch
+--- chinforpms/waterfox/waterfox-cubeb-build.patch	2020-03-16 14:17:56.198146471 -0400
++++ stackrpms/waterfox/waterfox-cubeb-build.patch	1969-12-31 19:00:00.000000000 -0500
+@@ -1,8 +0,0 @@
+---- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild	2018-01-05 16:39:00.921101411 -0200
+-+++ Waterfox-56.0.2/media/libcubeb/src/moz.build	2018-01-05 16:40:44.948718748 -0200
+-@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
+- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+- 
+- # We allow warnings for third-party code that can be updated from upstream.
+--AllowCompilerWarnings()
+-+ALLOW_COMPILER_WARNINGS = True
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig
+--- chinforpms/waterfox/waterfox-mozconfig	2020-03-16 14:17:56.198146471 -0400
++++ stackrpms/waterfox/waterfox-mozconfig	2020-03-04 16:08:26.581716366 -0500
+@@ -35,4 +35,4 @@
+ ac_add_options --with-app-name=waterfox
+ ac_add_options --with-app-basename=Waterfox
+ ac_add_options --with-branding=browser/branding/unofficial
+-ac_add_options --with-distribution-id=chinforpms
++ac_add_options --with-distribution-id=stackrpms
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec
+--- chinforpms/waterfox/waterfox.spec	2020-06-04 13:46:08.786538725 -0400
++++ stackrpms/waterfox/waterfox.spec	2020-06-04 13:49:13.091692264 -0400
+@@ -70,7 +70,8 @@
+ %global debug_build       0
+ 
+ %global build_stylo       0
+-%global build_rust_simd   1
++# stackrpms: disable simd because it only causes problems
++%global build_rust_simd   0
+ # Set to build with pinned rust version
+ # This enables stylo build when default rust version is not supported
+ # and a downgraded rust package exists
+@@ -125,10 +126,38 @@
+ 
+ %global build_langpacks         1
+ 
++# additional repos to get python27 and devtoolset-7
++# for el6 and el7: Software Collection;, for x86_64 only
++# http://mirror.centos.org/centos/6/sclo/x86_64/rh/
++# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
++# for el6.i386:
++# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/
++# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/
++%define scl_env %{nil}
++%define scl_buildreq coreutils
++%if 0%{?rhel} == 7
++%define scl_env devtoolset-7
++%define scl_buildreq devtoolset-7-toolchain
++%global system_nss        0
++%global system_hunspell   0
++%global system_libevent   0
++%global system_sqlite     0
++%global system_libvpx     0
++%global build_stylo       0
++%global build_rust_simd   0
++%global build_with_pgo    0
++%if "%{?scl_env}" != ""
++BuildRequires: %{scl_buildreq}
++%endif
++%endif
++%if 0%{?rhel} >= 7
++%global system_webp       0
++%endif
++
+ Summary:        Waterfox Web browser
+ Name:           waterfox
+ Version:        2020.06
+-Release:        1%{?branch:.%{branch}}%{?gver}%{?dist}
++Release:        11%{?branch:.%{branch}}%{?gver}%{?dist}
+ URL:            https://www.waterfox.net
+ License:        MPLv1.1 or GPLv2+ or LGPLv2+
+ 
+@@ -148,7 +177,7 @@
+ Source602:      patch-bug1381815
+ 
+ Source10:       waterfox-mozconfig
+-Source12:       waterfox-chinfo-default-prefs.js
++Source12:       bgstack15-%{name}-prefs.js
+ Source20:       waterfox.desktop
+ Source21:       waterfox.sh.in
+ Source23:       waterfox.1
+@@ -267,21 +296,20 @@
+ BuildRequires:  yasm
+ BuildRequires:  llvm
+ BuildRequires:  llvm-devel
+-# clang is needed even with gcc
++%if !0%{?el7}
+ BuildRequires:  clang
++BuildRequires:  clang-libs
+ BuildRequires:  clang-devel
+-%if 0%{?build_with_clang}
+ BuildRequires:  lld
+ BuildRequires:  libstdc++-static
++%endif
+ %if 0%{?build_with_pgo}
+ BuildRequires:  compiler-rt
+ %endif
+-%else
+ %if 0%{?fedora} > 30
+ BuildRequires:  binutils-gold
+ %endif
+ BuildRequires:  gcc-c++
+-%endif
+ BuildRequires:  bash
+ BuildRequires:  patchutils
+ 
+@@ -300,7 +328,9 @@
+ Requires:       nss >= 3.29.1-2.1
+ 
+ BuildRequires:  desktop-file-utils
++%if 0%{?rhel} != 8
+ BuildRequires:  system-bookmarks
++%endif
+ %if 0%{?system_sqlite}
+ BuildRequires:  pkgconfig(sqlite3) >= %{sqlite_version}
+ Requires:       sqlite >= %{sqlite_build_version}
+@@ -758,6 +788,12 @@
+ %endif
+ EOF
+ 
++%if "%{?scl_env}" != ""
++   thispwd=$( pwd )
++   scl enable %{scl_env} /bin/bash << 'EOFSCL'
++   pushd $thispwd
++%endif
++
+ source ./%{name}-env
+ 
+ %if 0%{?build_with_pgo}
+@@ -768,6 +804,11 @@
+ SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach}
+ %endif
+ 
++%if "%{?scl_env}" != ""
++   popd || :
++EOFSCL
++%endif
++
+ %if %{?run_tests}
+ %if 0%{?system_nss}
+ ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil
+@@ -801,9 +842,16 @@
+ #---------------------------------------------------------------------
+ 
+ %install
++%if "%{?scl_env}" != ""
++   thispwd=$( pwd )
++   scl enable %{scl_env} /bin/bash << 'EOFSCL'
++   pushd $thispwd
++%endif
+ 
++%if ! 0%{?rhel} >= 8
+ # set up our default bookmarks
+ cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
++%endif
+ 
+ # Make sure locale works for langpacks
+ cat > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
+@@ -948,6 +996,11 @@
+ rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so
+ #---------------------------------------------------------------------
+ 
++%if "%{?scl_env}" != ""
++   popd || :
++EOFSCL
++%endif
++
+ # Moves defaults/preferences to browser/defaults/preferences
+ %pretrans -p <lua>
+ require 'posix'
+@@ -990,7 +1043,7 @@
+ %license %{mozappdir}/LICENSE
+ %{mozappdir}/browser/chrome
+ %{mozappdir}/browser/chrome.manifest
+-%{mozappdir}/browser/defaults/preferences/*-default-prefs.js
++%{mozappdir}/browser/defaults/preferences/*.js
+ %{mozappdir}/browser/features
+ %{mozappdir}/distribution/distribution.ini
+ # That's Windows only
+@@ -1031,6 +1084,11 @@
+ #---------------------------------------------------------------------
+ 
+ %changelog
++* Thu Jun 04 2020 B Stack <bgstack15@gmail.com> - 2020.06-11.classic
++- add el7 and el8 support
++- repackage for stackrpms
++- disable simd globally
++
+ * Thu Jun 04 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.06-1.classic
+ - 2020.06
+ 
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 280135a..5695668 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -156,7 +156,7 @@ BuildRequires: %{scl_buildreq}
 
 Summary:        Waterfox Web browser
 Name:           waterfox
-Version:        2020.05
+Version:        2020.06
 Release:        11%{?branch:.%{branch}}%{?gver}%{?dist}
 URL:            https://www.waterfox.net
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -460,8 +460,8 @@ done
 # 4: uncertain
 for i in \
   702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
-  1401909 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
-  1384121 1384701 1388744 1401063 1413143 1415883 1437450 \
+  1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
+  1384121 1384701 1388744 1401063 1413143 1415883 1402442 1437450 \
   1447519
 do
   rm -f _patches/patch-bug${i}
@@ -1084,11 +1084,14 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Mon May 11 2020 B Stack <bgstack15@gmail.com> - 2020.05-11.classic
+* Thu Jun 04 2020 B Stack <bgstack15@gmail.com> - 2020.06-11.classic
 - add el7 and el8 support
 - repackage for stackrpms
 - disable simd globally
 
+* Thu Jun 04 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.06-1.classic
+- 2020.06
+
 * Sat May 09 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.05-1.classic
 - 2020.05