summaryrefslogtreecommitdiff
path: root/waterfox
diff options
context:
space:
mode:
Diffstat (limited to 'waterfox')
-rw-r--r--waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch38
-rw-r--r--waterfox/README.md6
-rw-r--r--waterfox/bgstack15-waterfox-prefs.js9
-rw-r--r--waterfox/bug1375074-save-restore-x28.patch74
-rw-r--r--waterfox/debian/README.debian5
-rw-r--r--waterfox/debian/bgstack15-waterfox-prefs.js9
-rw-r--r--waterfox/debian/changelog106
-rw-r--r--waterfox/debian/control85
-rw-r--r--waterfox/debian/mozconfig4
-rw-r--r--waterfox/debian/watch5
-rw-r--r--waterfox/debian/waterfox.dsc14
-rw-r--r--waterfox/debian/waterfox_devuan.dsc14
-rw-r--r--waterfox/mozilla-256180.patch11
-rw-r--r--waterfox/patch-bug1321069102
-rw-r--r--waterfox/patch-bug1381815278
-rw-r--r--waterfox/rhbz-1497932.patch21
-rw-r--r--waterfox/stackrpms-2019-03-06.diff134
-rw-r--r--waterfox/stackrpms-2020-06-04.diff220
-rwxr-xr-xwaterfox/stackrpms-diff.sh2
-rw-r--r--waterfox/waterfox.spec102
20 files changed, 910 insertions, 329 deletions
diff --git a/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch b/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch
new file mode 100644
index 0000000..f600f17
--- /dev/null
+++ b/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch
@@ -0,0 +1,38 @@
+From 26459c47f867dc1882fa7b87e32a9e8fc5e125e5 Mon Sep 17 00:00:00 2001
+From: Andrea Marchesini <amarchesini@mozilla.com>
+Date: Mon, 13 Jul 2020 08:34:07 +0000
+Subject: [PATCH] Bug 1650811 - Make Base64 compatible with ReadSegments() with
+ small buffers. r=asuth, a=RyanVM
+
+Differential Revision: https://phabricator.services.mozilla.com/D82522
+---
+ netwerk/test/gtest/moz.build | 1 +
+ xpcom/io/Base64.cpp | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/netwerk/test/gtest/moz.build b/netwerk/test/gtest/moz.build
+index 34a06c9943ac..fa7c90ff3bdd 100644
+--- a/netwerk/test/gtest/moz.build
++++ b/netwerk/test/gtest/moz.build
+@@ -6,6 +6,7 @@
+
+ UNIFIED_SOURCES += [
+ 'TestBase64Stream.cpp',
++ 'TestBufferedInputStream.cpp',
+ 'TestHeaders.cpp',
+ 'TestHttpAuthUtils.cpp',
+ 'TestProtocolProxyService.cpp',
+diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp
+index 2f9f50b6528b..72ad070c4bf5 100644
+--- a/xpcom/io/Base64.cpp
++++ b/xpcom/io/Base64.cpp
+@@ -107,6 +107,9 @@ nsresult EncodeInputStream_Encoder(nsIInputStream* aStream, void* aClosure,
+ // We consume the whole data always.
+ *aWriteCount = aCount;
+
++ // We consume the whole data always.
++ *aWriteCount = aCount;
++
+ // If we have any data left from last time, encode it now.
+ uint32_t countRemaining = aCount;
+ const unsigned char* src = (const unsigned char*)aFromSegment;
diff --git a/waterfox/README.md b/waterfox/README.md
index 77a9b01..11400d5 100644
--- a/waterfox/README.md
+++ b/waterfox/README.md
@@ -13,7 +13,11 @@ https://build.opensuse.org/package/view_file/home:hawkeye116477:waterfox/waterfo
# Reverse dependency matrix
Distro | Waterfox version
---------- | ----------------
-All | 2019.10-classic
+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/bgstack15-waterfox-prefs.js b/waterfox/bgstack15-waterfox-prefs.js
index d78172c..716667c 100644
--- a/waterfox/bgstack15-waterfox-prefs.js
+++ b/waterfox/bgstack15-waterfox-prefs.js
@@ -1,6 +1,6 @@
// file: /usr/lib/waterfox/browser/defaults/preferences/bgstack15-waterfox-prefs.js
// deployed with waterfox package (rpm or dpkg) built by bgstack15
-// last modified 2019-12-21
+// last modified 2020-04-15
// reference:
// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
// bgstack15-palemoon-prefs.js
@@ -28,7 +28,12 @@ pref("browser.startup.page", 3);
pref("browser.tabs.closeWindowWithLastTab", false);
pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"e10s-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"sync-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"urlbar-container\",\"bookmarks-menu-button\",\"downloads-button\",\"home-button\",\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\",\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":6,\"newElementCount\":0}");
pref("browser.uidensity", 1);
-pref("browser.urlbar.trimURLs", false);
+// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work.
+//pref("browser.urlbar.disableExtendForTests", true);
+//pref("browser.urlbar.maxRichResults", 0);
+pref("browser.urlbar.trimURLs", false);
+pref("browser.urlbar.update1", false);
+pref("browser.xul.error_pages.enabled", false);
pref("camera.control.face_detection.enabled", false);
pref("captivedetect.canonicalURL", "http://127.0.0.1:9999/");
pref("devtools.devedition.promo.url", "https://127.0.0.1:9999/");
diff --git a/waterfox/bug1375074-save-restore-x28.patch b/waterfox/bug1375074-save-restore-x28.patch
deleted file mode 100644
index 57a83a2..0000000
--- a/waterfox/bug1375074-save-restore-x28.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-# Wed Feb 28 13:57:52 2018 +0100
-# Node ID 672f0415217b202ae59a930769dffd9d6ba6b87c
-# Parent 825fd04dacc6297d3a980ec4184079405950b35d
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.
-
-diff --git a/js/src/jit-test/tests/bug1375074.js b/js/src/jit-test/tests/bug1375074.js
-new file mode 100644
---- /dev/null
-+++ b/js/src/jit-test/tests/bug1375074.js
-@@ -0,0 +1,18 @@
-+// This forces the VM to start creating unboxed objects and thus stresses a
-+// particular path into generated code for a specialized unboxed object
-+// constructor.
-+
-+var K = 2000; // 2000 should be plenty
-+var s = "[";
-+var i;
-+for ( i=0; i < K-1; i++ )
-+ s = s + `{"i":${i}},`;
-+s += `{"i":${i}}]`;
-+var v = JSON.parse(s);
-+
-+assertEq(v.length == K, true);
-+
-+for ( i=0; i < K; i++) {
-+ assertEq(v[i] instanceof Object, true);
-+ assertEq(v[i].i, i);
-+}
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
---- a/js/src/vm/UnboxedObject.cpp
-+++ b/js/src/vm/UnboxedObject.cpp
-@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSCon
- #endif
-
- #ifdef JS_CODEGEN_ARM64
-- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+ // addressing. The register we use for PSP may however also be used by
-+ // calling code, and it is nonvolatile, so save it. Do this as a special
-+ // case first because the generic save/restore code needs the PSP to be
-+ // initialized already.
-+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+ // Initialize the PSP from the SP.
- masm.initStackPtr();
- #endif
-
-@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSCon
- masm.pop(ScratchDoubleReg);
- masm.PopRegsInMask(savedNonVolatileRegisters);
-
-+#ifdef JS_CODEGEN_ARM64
-+ // Now restore the value that was in the PSP register on entry, and return.
-+
-+ // Obtain the correct SP from the PSP.
-+ masm.Mov(sp, PseudoStackPointer64);
-+
-+ // Restore the saved value of the PSP register, this value is whatever the
-+ // caller had saved in it, not any actual SP value, and it must not be
-+ // overwritten subsequently.
-+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+ masm.Ret(vixl::lr);
-+#else
- masm.abiret();
-+#endif
-
- masm.bind(&failureStoreOther);
-
diff --git a/waterfox/debian/README.debian b/waterfox/debian/README.debian
index e69de29..ae660ab 100644
--- a/waterfox/debian/README.debian
+++ b/waterfox/debian/README.debian
@@ -0,0 +1,5 @@
+waterfox (2020.01-1+devuan) obs; urgency=medium
+
+ - Cherry-picked a patch from upstream so the application can actually compile: 45130a237874aaa96bdf23ee107b0be0e0a2afab.patch
+
+ -- B Stack <bgstack15@gmail.com> Tue, 28 Jan 2020 07:58:33 -0500
diff --git a/waterfox/debian/bgstack15-waterfox-prefs.js b/waterfox/debian/bgstack15-waterfox-prefs.js
index d78172c..716667c 100644
--- a/waterfox/debian/bgstack15-waterfox-prefs.js
+++ b/waterfox/debian/bgstack15-waterfox-prefs.js
@@ -1,6 +1,6 @@
// file: /usr/lib/waterfox/browser/defaults/preferences/bgstack15-waterfox-prefs.js
// deployed with waterfox package (rpm or dpkg) built by bgstack15
-// last modified 2019-12-21
+// last modified 2020-04-15
// reference:
// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
// bgstack15-palemoon-prefs.js
@@ -28,7 +28,12 @@ pref("browser.startup.page", 3);
pref("browser.tabs.closeWindowWithLastTab", false);
pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"e10s-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"sync-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"urlbar-container\",\"bookmarks-menu-button\",\"downloads-button\",\"home-button\",\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\",\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":6,\"newElementCount\":0}");
pref("browser.uidensity", 1);
-pref("browser.urlbar.trimURLs", false);
+// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work.
+//pref("browser.urlbar.disableExtendForTests", true);
+//pref("browser.urlbar.maxRichResults", 0);
+pref("browser.urlbar.trimURLs", false);
+pref("browser.urlbar.update1", false);
+pref("browser.xul.error_pages.enabled", false);
pref("camera.control.face_detection.enabled", false);
pref("captivedetect.canonicalURL", "http://127.0.0.1:9999/");
pref("devtools.devedition.promo.url", "https://127.0.0.1:9999/");
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 79eff80..8fe42fc 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,109 @@
+waterfox (2020.08-1+devuan) obs; urgency=medium
+
+ - Latest version
+ * Updated Network Security Services
+ * Set maximum supported TLS version to 1.3 and minimum to 1.2
+ * Updated SQLite library
+ * Improved <table> support
+ * Latest security advisories patched (best effort)
+
+ -- Ben Stack <bgstack15@gmail.com> Tue, 25 Aug 2020 14:26:28 -0400
+
+waterfox (2020.07-1+devuan) obs; urgency=medium
+
+ - Latest version. No release notes yet on waterfox.net
+
+ -- Ben Stack <bgstack15@gmail.com> Tue, 11 Aug 2020 14:01:31 -0400
+
+waterfox (2020.06-1+devuan) obs; urgency=medium
+
+ - Latest security advisories patched (best effort).
+ * Note: Aware of issues with some websites such as Netflix! It is
+ being investigated.
+ * As the differences between Classic and later Firefox versions
+ grow, we are doing our best to patch the security advisories as
+ we think apply to Classic.
+
+ -- Ben Stack <bgstack15@gmail.com> Sat, 04 Jul 2020 12:04:59 -0400
+
+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)*
+
+ -- Ben Stack <bgstack15@gmail.com> Wed, 08 Apr 2020 14:38:08 -0400
+
+waterfox (2020.04-1+devuan) obs; urgency=medium
+
+ * From blog release notes
+ - Classic branch
+ * Fixed various security issues
+ * Improved gtk support (thanks to hawkeye116477)
+ * Fixed library requirements on Linux
+ * Various media library updates
+ * Added DNS resolution to webextensions api
+ * Updated timezone data for internationalization functions
+ * Enabled unprefixed Fullscreen API
+ * Various website rending issues fixed (Kinguin, Intel, Epic Games and others)
+ * Fixed problems related with uBO html filters
+ * Updated en-US dictionary
+
+ -- Ben Stack <bgstack15@gmail.com> Wed, 08 Apr 2020 14:38:08 -0400
+
+waterfox (2020.03-1+devuan) obs; urgency=medium
+
+ - From blog release notes
+ - Classic branch
+ * Fixed various websites not loading properly (Thanks to hawkeye116477 for the gargantuan effort)
+ * Logo now has Classic tag to differentiate from Current
+ * Improved gtk3 support
+ * Fixed DRM issues (Netflix, Prime Video etc)
+ * Various privacy settings update
+ * Fixed library requirements on Linux
+ * Various media library updates
+ * Added DNS resolution to webextensions api
+ * Updated timezone data for internationalization functions
+ * Enabled unprefixed Fullscreen API
+ * Various website rending issues fixed (Kinguin, Intel, Epic Games and others)
+ * Fixed problems related with uBO html filters
+ * Updated en-US dictionary
+
+ -- Ben Stack <bgstack15@gmail.com> Thu, 12 Mar 2020 08:35:07 -0400
+
+waterfox (2020.02-1+devuan) obs; urgency=medium
+
+ - From blog release notes
+ - Classic branch
+ * Fixed library requirements on Linux
+ * Various media library updates
+ * Added DNS resolution to webextensions api
+ * Updated timezone data for internationalization functions
+ * Enabled unprefixed Fullscreen API
+ * Various website rending issues fixed (Kinguin, Intel, Epic Games and others)
+ * Fixed problems related with uBO html filters
+ * Updated en-US dictionary
+
+ -- B Stack <bgstack15@gmail.com> Tue, 18 Feb 2020 15:33:11 -0500
+
+waterfox (2020.01-1+devuan) obs; urgency=medium
+
+ - From blog release notes
+ - Classic branch
+ * Very important security patches
+
+ -- B Stack <bgstack15@gmail.com> Tue, 28 Jan 2020 07:58:33 -0500
+
waterfox (2019.12-1+devuan) obs; urgency=medium
- Classic branch
diff --git a/waterfox/debian/control b/waterfox/debian/control
index f9736d9..a55d956 100644
--- a/waterfox/debian/control
+++ b/waterfox/debian/control
@@ -4,49 +4,50 @@ Priority: optional
Maintainer: B Stack <bgstack15@gmail.com>
XSBC-Original-Maintainer: Steven Pusser <stevep@mxlinux.org>
Build-Depends: debhelper (>= 12),
- autoconf2.13,
- autotools-dev,
- binutils-avr,
- cargo (>= 0.25),
- 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,
- libpulse-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.24),
- unzip,
- xauth,
- xfonts-base,
- xvfb,
- yasm (>= 1.1),
- zip,
- zlib1g-dev
+ 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),
+ libfontconfig-dev,
+ 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 (>= 2.7.18-2~) | python (>= 2.7),
+ python-ply,
+ rustc (>= 1.34),
+ unzip,
+ xauth,
+ xfonts-base,
+ xvfb,
+ yasm (>= 1.1),
+ zip,
+ zlib1g-dev
+# disabled for testing python-minimal (>= 2.6.6-13~),
Standards-Version: 3.9.7
Homepage: https://www.waterfox.net/
+# libfontconfig-dev only added for Debian OBS which is choking as of 2020-04 on libfontconfig-dev | libfontconfig1-dev for deps: libgtk-3-dev, libpango1.0-dev, libcairo2-dev, libxft-dev
Package: waterfox
Architecture: any
@@ -54,7 +55,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: waterfox-kde
Replaces: waterfox-kde
Provides: www-browser, gnome-www-browser, waterfox-classic
-Suggests: fonts-lyx, libasound2, pulseaudio
+Suggests: fonts-lyx, libasound2
Description: Free, open and private browser
Waterfox focuses on giving users choice while also helping make the world a
better place. Watefox is partners with Ecosia, a search engine that plants trees
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/watch b/waterfox/debian/watch
new file mode 100644
index 0000000..00aff65
--- /dev/null
+++ b/waterfox/debian/watch
@@ -0,0 +1,5 @@
+# This can pull in the source code, but not the real xpi file. Unfortunately you need to hand-assemble a tarball with the xpi file in it. See README.debian
+version=4
+# uscan will make a nice symlink, so no name mangling is required.
+opts=filenamemangle=s/.+\/([\d\.]+-classic)\.tar\.gz/waterfox_$1.orig\.tar\.gz/ \
+ https://github.com/MrAlex94/Waterfox/tags .*/([\d\.]+)-classic\.tar\.gz
diff --git a/waterfox/debian/waterfox.dsc b/waterfox/debian/waterfox.dsc
deleted file mode 100644
index b30ce9d..0000000
--- a/waterfox/debian/waterfox.dsc
+++ /dev/null
@@ -1,14 +0,0 @@
-Format: 3.0 (quilt)
-Source: waterfox
-Binary: waterfox
-Architecture: any
-Version: 56.2.4-0
-Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
-Homepage: https://www.waterfox.net/
-Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9), autoconf2.13, libgtk-3-dev (>= 3.4), libgconf2-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm (>= 1.1), build-essential, libgtk2.0-dev (>= 2.10), libxt-dev, python2.7, python-minimal (>= 2.6.6-13~), python-ply, zip, unzip, ccache, cargo (>= 0.25), libgl1-mesa-dev, libnotify-dev, binutils-avr, libfreetype6-dev, libfontconfig1-dev, pkg-config, libtinfo-dev, clang-6.0 | clang-4.0, llvm-6.0-dev | llvm-4.0-dev, rustc (>= 1.24), libxext-dev, libglib2.0-dev (>= 2.16.0), libpango1.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, libfile-fcntllock-perl, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev (>= 1.16.1.1~), libevent-dev (>= 1.4.1), libjsoncpp-dev, xfonts-base, xauth, lsb-release
-Package-List:
- waterfox deb web optional arch=any
-Files:
- 0000000000000000000000000000000 1 waterfox.orig.tar.gz
- 0000000000000000000000000000000 1 waterfox.debian.tar.gz
diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc
new file mode 100644
index 0000000..9d4a57a
--- /dev/null
+++ b/waterfox/debian/waterfox_devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: waterfox
+Binary: waterfox
+Architecture: any
+Version: 2020.08-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 (>= 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 (>= 2.7.18-2~) | python (>= 2.7), 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:
+ 0000000000000000000000000000000 1 waterfox.orig.tar.gz
+ 0000000000000000000000000000000 1 waterfox.debian.tar.gz
diff --git a/waterfox/mozilla-256180.patch b/waterfox/mozilla-256180.patch
deleted file mode 100644
index 13a1c97..0000000
--- a/waterfox/mozilla-256180.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/layout/generic/nsIFrame.h.old 2016-07-11 13:41:39.688276559 +0200
-+++ b/layout/generic/nsIFrame.h 2016-07-11 13:42:12.791406976 +0200
-@@ -13,7 +13,7 @@
- #error This header/class should only be used within Mozilla code. It should not be used by extensions.
- #endif
-
--#define MAX_REFLOW_DEPTH 200
-+#define MAX_REFLOW_DEPTH 1000
-
- /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is eventually
- going to be eliminated, and all callers will use nsFrame instead. At the moment
diff --git a/waterfox/patch-bug1321069 b/waterfox/patch-bug1321069
new file mode 100644
index 0000000..6663400
--- /dev/null
+++ b/waterfox/patch-bug1321069
@@ -0,0 +1,102 @@
+commit a09c25bcc3b4
+Author: Kartikaya Gupta <kgupta@mozilla.com>
+Date: Wed May 30 09:49:23 2018 -0400
+
+ Bug 1321069 - Redirect the end event of a long-tap sequence back to the content window. r=karlt, a=RyanVM
+
+ In the case of a long-tap touch sequence, a new popup window (the
+ contextmenu) is spawned while the sequence is ongoing. The touch-end of
+ the sequence ends up getting delivered to the popup window, instead of
+ the original content window, and that causes the touch-handling
+ machinery state in the content window to get out of sync with reality.
+ This patch detects this scenario and redirects the touch events on the
+ popup window back to the original content window.
+
+ MozReview-Commit-ID: L2vvKLlogRA
+
+ --HG--
+ extra : source : 27a160b7025ffaadd7cc1ce326ce8729c2b180a0
+---
+ widget/gtk/nsWindow.cpp | 36 +++++++++++++++++++++++++++++++++++-
+ widget/gtk/nsWindow.h | 3 +++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index 54ec8615051f1..18d0ccac4dbd6 100644
+--- widget/gtk/nsWindow.cpp
++++ widget/gtk/nsWindow.cpp
+@@ -3455,11 +3455,41 @@ nsWindow::OnDragDataReceivedEvent(GtkWidget *aWidget,
+ aSelectionData, aInfo, aTime);
+ }
+
++nsWindow*
++nsWindow::GetTransientForWindowIfPopup()
++{
++ if (mWindowType != eWindowType_popup) {
++ return nullptr;
++ }
++ GtkWindow* toplevel = gtk_window_get_transient_for(GTK_WINDOW(mShell));
++ if (toplevel) {
++ return get_window_for_gtk_widget(GTK_WIDGET(toplevel));
++ }
++ return nullptr;
++}
++
++bool
++nsWindow::IsHandlingTouchSequence(GdkEventSequence* aSequence)
++{
++ return mHandleTouchEvent && mTouches.Contains(aSequence);
++}
++
+ #if GTK_CHECK_VERSION(3,4,0)
+ gboolean
+ nsWindow::OnTouchEvent(GdkEventTouch* aEvent)
+ {
+ if (!mHandleTouchEvent) {
++ // If a popup window was spawned (e.g. as the result of a long-press)
++ // and touch events got diverted to that window within a touch sequence,
++ // ensure the touch event gets sent to the original window instead. We
++ // keep the checks here very conservative so that we only redirect
++ // events in this specific scenario.
++ nsWindow* targetWindow = GetTransientForWindowIfPopup();
++ if (targetWindow &&
++ targetWindow->IsHandlingTouchSequence(aEvent->sequence)) {
++ return targetWindow->OnTouchEvent(aEvent);
++ }
++
+ return FALSE;
+ }
+
+@@ -4780,12 +4810,16 @@ nsWindow::GrabPointer(guint32 aTime)
+ return;
+
+ gint retval;
++ // Note that we need GDK_TOUCH_MASK below to work around a GDK/X11 bug that
++ // causes touch events that would normally be received by this client on
++ // other windows to be discarded during the grab.
+ retval = gdk_pointer_grab(mGdkWindow, TRUE,
+ (GdkEventMask)(GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
+- GDK_POINTER_MOTION_MASK),
++ GDK_POINTER_MOTION_MASK |
++ GDK_TOUCH_MASK),
+ (GdkWindow *)nullptr, nullptr, aTime);
+
+ if (retval == GDK_GRAB_NOT_VIEWABLE) {
+diff --git widget/gtk/nsWindow.h widget/gtk/nsWindow.h
+index c28c1749c76dc..33e8c4db7c1c0 100644
+--- widget/gtk/nsWindow.h
++++ widget/gtk/nsWindow.h
+@@ -434,7 +434,10 @@ private:
+ nsIWidgetListener* GetListener();
+ bool IsComposited() const;
+
+ void UpdateClientOffsetForCSDWindow();
++
++ nsWindow* GetTransientForWindowIfPopup();
++ bool IsHandlingTouchSequence(GdkEventSequence* aSequence);
+
+ GtkWidget *mShell;
+ MozContainer *mContainer;
diff --git a/waterfox/patch-bug1381815 b/waterfox/patch-bug1381815
new file mode 100644
index 0000000..c18d856
--- /dev/null
+++ b/waterfox/patch-bug1381815
@@ -0,0 +1,278 @@
+commit 165fab2f8596
+Author: Jan Horak <jhorak@redhat.com>
+Date: Tue Oct 10 13:35:56 2017 +0200
+
+ Bug 1381815 - fixing dimensions of radio and checkbox for GTK 3.20+; r=karlt
+
+ In the GTK < 3.20 the size of radio and checkbox toggle is determined by indicator
+ spacing and indicator size. By GTK 3.20+ it is replaced by standard box model
+ (padding, margin, border). The patch fixes that while keeping the functionality
+ for older GTK. The values are also cached by similar way as scrollbar metrics
+ are cached now.
+
+ The focus is no longer rendered by GTK but by Mozilla code, so the extra
+ size for toggles has been removed from GetExtraSizeForWidget and toggles
+ no longer render focus indicator.
+
+ MozReview-Commit-ID: 1Wg5AgHy1Vz
+
+ --HG--
+ extra : rebase_source : 81437f45b7d32555942d21fccc9de4a561d85111
+---
+ widget/gtk/gtk3drawing.cpp | 121 ++++++++++++++++++++++++++++++----------
+ widget/gtk/gtkdrawing.h | 14 +++++
+ widget/gtk/nsNativeThemeGTK.cpp | 32 +----------
+ 3 files changed, 107 insertions(+), 60 deletions(-)
+
+diff --git widget/gtk/gtk3drawing.cpp widget/gtk/gtk3drawing.cpp
+index 4c562b380095..7968aef920f6 100644
+--- widget/gtk/gtk3drawing.cpp
++++ widget/gtk/gtk3drawing.cpp
+@@ -24,6 +24,8 @@ static gboolean notebook_has_tab_gap;
+
+ static ScrollbarGTKMetrics sScrollbarMetrics[2];
+ static ToolbarGTKMetrics sToolbarMetrics;
++static ToggleGTKMetrics sCheckboxMetrics;
++static ToggleGTKMetrics sRadioMetrics;
+
+ #define ARROW_UP 0
+ #define ARROW_DOWN G_PI
+@@ -190,6 +192,8 @@ moz_gtk_refresh()
+ sScrollbarMetrics[GTK_ORIENTATION_HORIZONTAL].initialized = false;
+ sScrollbarMetrics[GTK_ORIENTATION_VERTICAL].initialized = false;
+ sToolbarMetrics.initialized = false;
++ sCheckboxMetrics.initialized = false;
++ sRadioMetrics.initialized = false;
+
+ /* This will destroy all of our widgets */
+ ResetWidgetCache();
+@@ -611,33 +615,21 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+ gboolean isradio, GtkTextDirection direction)
+ {
+ GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
+- gint indicator_size, indicator_spacing;
+ gint x, y, width, height;
+- gint focus_x, focus_y, focus_width, focus_height;
+ GtkStyleContext *style;
+
+- GtkWidget *widget = GetWidget(isradio ? MOZ_GTK_RADIOBUTTON_CONTAINER :
+- MOZ_GTK_CHECKBUTTON_CONTAINER);
+- gtk_widget_style_get(widget,
+- "indicator_size", &indicator_size,
+- "indicator_spacing", &indicator_spacing,
+- nullptr);
++ const ToggleGTKMetrics* metrics = GetToggleMetrics(isradio);
+
+ // XXX we should assert rect->height >= indicator_size too
+ // after bug 369581 is fixed.
+- MOZ_ASSERT(rect->width >= indicator_size,
++ MOZ_ASSERT(rect->width >= metrics->minSizeWithBorder.width,
+ "GetMinimumWidgetSize was ignored");
+
+ // Paint it center aligned in the rect.
+- x = rect->x + (rect->width - indicator_size) / 2;
+- y = rect->y + (rect->height - indicator_size) / 2;
+- width = indicator_size;
+- height = indicator_size;
+-
+- focus_x = x - indicator_spacing;
+- focus_y = y - indicator_spacing;
+- focus_width = width + 2 * indicator_spacing;
+- focus_height = height + 2 * indicator_spacing;
++ width = metrics->minSizeWithBorder.width;
++ height = metrics->minSizeWithBorder.height;
++ x = rect->x + (rect->width - width) / 2;
++ y = rect->y + (rect->height - height) / 2;
+
+ if (selected)
+ state_flags = static_cast<GtkStateFlags>(state_flags|checkbox_check_state);
+@@ -651,20 +643,25 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+ if (gtk_check_version(3, 20, 0) == nullptr) {
+ gtk_render_background(style, cr, x, y, width, height);
+ gtk_render_frame(style, cr, x, y, width, height);
+- }
+-
+- if (isradio) {
+- gtk_render_option(style, cr, x, y, width, height);
+- if (state->focused) {
+- gtk_render_focus(style, cr, focus_x, focus_y,
+- focus_width, focus_height);
++ // Indicator is inset by the toggle's padding and border.
++ gint indicator_x = x + metrics->borderAndPadding.left;
++ gint indicator_y = y + metrics->borderAndPadding.top;
++ gint indicator_width = metrics->minSizeWithBorder.width -
++ metrics->borderAndPadding.left - metrics->borderAndPadding.right;
++ gint indicator_height = metrics->minSizeWithBorder.height -
++ metrics->borderAndPadding.top - metrics->borderAndPadding.bottom;
++ if (isradio) {
++ gtk_render_option(style, cr, indicator_x, indicator_y,
++ indicator_width, indicator_height);
++ } else {
++ gtk_render_check(style, cr, indicator_x, indicator_y,
++ indicator_width, indicator_height);
+ }
+- }
+- else {
+- gtk_render_check(style, cr, x, y, width, height);
+- if (state->focused) {
+- gtk_render_focus(style, cr,
+- focus_x, focus_y, focus_width, focus_height);
++ } else {
++ if (isradio) {
++ gtk_render_option(style, cr, x, y, width, height);
++ } else {
++ gtk_render_check(style, cr, x, y, width, height);
+ }
+ }
+
+@@ -2789,6 +2786,68 @@ SizeFromLengthAndBreadth(GtkOrientation
+ MozGtkSize({aLength, aBreadth}) : MozGtkSize({aBreadth, aLength});
+ }
+
++const ToggleGTKMetrics*
++GetToggleMetrics(bool isRadio)
++{
++ ToggleGTKMetrics* metrics;
++ if (isRadio) {
++ metrics = &sRadioMetrics;
++ } else {
++ metrics = &sCheckboxMetrics;
++ }
++ if (metrics->initialized)
++ return metrics;
++
++ metrics->initialized = true;
++ if (gtk_check_version(3,20,0) == nullptr) {
++ GtkStyleContext* style;
++ if (isRadio) {
++ style = GetStyleContext(MOZ_GTK_RADIOBUTTON);
++ } else {
++ style = GetStyleContext(MOZ_GTK_CHECKBUTTON);
++ }
++ GtkStateFlags state_flags = gtk_style_context_get_state(style);
++ gtk_style_context_get(style, state_flags,
++ "min-height",&(metrics->minSizeWithBorder.height),
++ "min-width", &(metrics->minSizeWithBorder.width),
++ nullptr);
++ // Fallback to indicator size if min dimensions are zero
++ if (metrics->minSizeWithBorder.height == 0 ||
++ metrics->minSizeWithBorder.width == 0) {
++ gint indicator_size;
++ gtk_widget_style_get(GetWidget(MOZ_GTK_CHECKBUTTON_CONTAINER),
++ "indicator_size", &indicator_size, nullptr);
++ if (metrics->minSizeWithBorder.height == 0) {
++ metrics->minSizeWithBorder.height = indicator_size;
++ }
++ if (metrics->minSizeWithBorder.width == 0) {
++ metrics->minSizeWithBorder.width = indicator_size;
++ }
++ }
++
++ GtkBorder border, padding;
++ gtk_style_context_get_border(style, state_flags, &border);
++ gtk_style_context_get_padding(style, state_flags, &padding);
++ metrics->borderAndPadding.left = border.left + padding.left;
++ metrics->borderAndPadding.right = border.right + padding.right;
++ metrics->borderAndPadding.top = border.top + padding.top;
++ metrics->borderAndPadding.bottom = border.bottom + padding.bottom;
++ metrics->minSizeWithBorder.width += metrics->borderAndPadding.left +
++ metrics->borderAndPadding.right;
++ metrics->minSizeWithBorder.height += metrics->borderAndPadding.top +
++ metrics->borderAndPadding.bottom;
++ } else {
++ gint indicator_size, indicator_spacing;
++ gtk_widget_style_get(GetWidget(MOZ_GTK_CHECKBUTTON_CONTAINER),
++ "indicator_size", &indicator_size,
++ "indicator_spacing", &indicator_spacing,
++ nullptr);
++ metrics->minSizeWithBorder.width =
++ metrics->minSizeWithBorder.height = indicator_size;
++ }
++ return metrics;
++}
++
+ const ScrollbarGTKMetrics*
+ GetScrollbarMetrics(GtkOrientation aOrientation)
+ {
+diff --git widget/gtk/gtkdrawing.h widget/gtk/gtkdrawing.h
+index 42dbf8287499..909c18f7f525 100644
+--- widget/gtk/gtkdrawing.h
++++ widget/gtk/gtkdrawing.h
+@@ -83,6 +83,12 @@ typedef struct {
+ } border;
+ } ScrollbarGTKMetrics;
+
++typedef struct {
++ bool initialized;
++ MozGtkSize minSizeWithBorder;
++ GtkBorder borderAndPadding;
++} ToggleGTKMetrics;
++
+ typedef enum {
+ MOZ_GTK_STEPPER_DOWN = 1 << 0,
+ MOZ_GTK_STEPPER_BOTTOM = 1 << 1,
+@@ -391,6 +397,14 @@ moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom,
+ gint
+ moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing);
+
++/**
++ * Get metrics of the toggle (radio or checkbox)
++ * isRadio: [IN] true when requesting metrics for the radio button
++ * returns: pointer to ToggleGTKMetrics struct
++ */
++const ToggleGTKMetrics*
++GetToggleMetrics(bool isRadio);
++
+ /**
+ * Get the desired size of a GtkRadioButton
+ * indicator_size: [OUT] the indicator size
+diff --git widget/gtk/nsNativeThemeGTK.cpp widget/gtk/nsNativeThemeGTK.cpp
+index 06e62efbcda8..da3eaa71a6b4 100644
+--- widget/gtk/nsNativeThemeGTK.cpp
++++ widget/gtk/nsNativeThemeGTK.cpp
+@@ -1020,24 +1020,6 @@ nsNativeThemeGTK::GetExtraSizeForWidget(nsIFrame* aFrame, uint8_t aWidgetType,
+ aExtra->left = aExtra->right = 1;
+ break;
+
+- // Include the indicator spacing (the padding around the control).
+- case NS_THEME_CHECKBOX:
+- case NS_THEME_RADIO:
+- {
+- gint indicator_size, indicator_spacing;
+-
+- if (aWidgetType == NS_THEME_CHECKBOX) {
+- moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing);
+- } else {
+- moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
+- }
+-
+- aExtra->top = indicator_spacing;
+- aExtra->right = indicator_spacing;
+- aExtra->bottom = indicator_spacing;
+- aExtra->left = indicator_spacing;
+- break;
+- }
+ case NS_THEME_BUTTON :
+ {
+ if (IsDefaultButton(aFrame)) {
+@@ -1595,17 +1577,9 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext,
+ case NS_THEME_CHECKBOX:
+ case NS_THEME_RADIO:
+ {
+- gint indicator_size, indicator_spacing;
+-
+- if (aWidgetType == NS_THEME_CHECKBOX) {
+- moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing);
+- } else {
+- moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
+- }
+-
+- // Include space for the indicator and the padding around it.
+- aResult->width = indicator_size;
+- aResult->height = indicator_size;
++ const ToggleGTKMetrics* metrics = GetToggleMetrics(aWidgetType == NS_THEME_RADIO);
++ aResult->width = metrics->minSizeWithBorder.width;
++ aResult->height = metrics->minSizeWithBorder.height;
+ }
+ break;
+ case NS_THEME_TOOLBARBUTTON_DROPDOWN:
diff --git a/waterfox/rhbz-1497932.patch b/waterfox/rhbz-1497932.patch
deleted file mode 100644
index d6e7886..0000000
--- a/waterfox/rhbz-1497932.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-56.0/media/webrtc/trunk/Makefile.old firefox-56.0/media/webrtc/trunk/Makefile
-diff -up firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old firefox-56.0/widget/gtk/mozgtk/mozgtk.c
---- firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old 2017-10-04 09:21:56.155553585 +0200
-+++ firefox-56.0/widget/gtk/mozgtk/mozgtk.c 2017-10-04 09:22:35.562427061 +0200
-@@ -61,7 +61,6 @@ STUB(gdk_screen_get_height_mm)
- STUB(gdk_screen_get_n_monitors)
- STUB(gdk_screen_get_monitor_at_window)
- STUB(gdk_screen_get_monitor_geometry)
--STUB(gdk_screen_get_monitor_workarea)
- STUB(gdk_screen_get_monitor_height_mm)
- STUB(gdk_screen_get_number)
- STUB(gdk_screen_get_resolution)
-@@ -550,6 +549,7 @@ STUB(gtk_render_line)
- STUB(gtk_render_option)
- STUB(gtk_render_slider)
- STUB(gtk_scale_new)
-+STUB(gdk_screen_get_monitor_workarea)
- STUB(gtk_scrollbar_new)
- STUB(gtk_style_context_add_class)
- STUB(gtk_style_context_add_region)
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/stackrpms-diff.sh b/waterfox/stackrpms-diff.sh
index 0a90beb..a6c5e99 100755
--- a/waterfox/stackrpms-diff.sh
+++ b/waterfox/stackrpms-diff.sh
@@ -1,3 +1,3 @@
# use this file to display the differences between chinfo upstream and my work.
# usage: stackrpms/waterfox/stackrpms-diff.sh | vi -
-diff -x 'README.md' -x 'bgstack15-waterfox-prefs.js' -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox
+diff -x 'README.md' -x 'bgstack15-waterfox-prefs.js' -x debian -x stackrpms*.diff -x stackrpms*.sh -x '*z' -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index a0467ef..3b3e5af 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,7 +1,9 @@
-%global commit 8864e433baf07e995e7047e840d8f94d8f1b2496
+%global _legacy_common_support 1
+
+%global commit d5de4ec99d1d61a309d7fcd96da12488c9afe550
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20191205
-%global with_snapshot 1
+%global date 20200408
+%global with_snapshot 0
%global branch classic
@@ -27,16 +29,13 @@ ExcludeArch: armv7hl
%global system_ffi 1
%global system_cairo 0
%global system_harfbuzz 1
-# libvpx is too new for Waterfox 56
-%if 0%{?fedora} < 30
-%global system_libvpx 1
-%else
%global system_libvpx 0
-%endif
%global system_webp 1
%global system_libicu 0
%global system_jpeg 1
+%global eme 0
+
%global run_tests 0
%global hardened_build 1
@@ -45,7 +44,7 @@ ExcludeArch: armv7hl
%global build_with_clang 0
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 1
+%global build_with_pgo 0
%endif
%ifarch x86_64
@@ -78,7 +77,7 @@ ExcludeArch: armv7hl
# and a downgraded rust package exists
%global build_with_pinned_rust 0
%global rust_build_min_ver 1.35
-%global rust_build_min_nover 1.38
+%global rust_build_min_nover 1.40
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -115,7 +114,7 @@ ExcludeArch: armv7hl
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
%endif
-%if %{branch} == "classic"
+%if "%{branch}" == "classic"
%global channel Classic
%else
%global channel Current
@@ -154,11 +153,15 @@ BuildRequires: %{scl_buildreq}
%if 0%{?rhel} >= 7
%global system_webp 0
%endif
+# added for 2020.08 because right now el8 does not have sqlite >= 3.30.1
+%if 0%{?rhel} == 8
+%global system_sqlite 0
+%endif
Summary: Waterfox Web browser
Name: waterfox
-Version: 2019.12
-Release: 13.%{branch}%{?gver}%{?dist}
+Version: 2020.08
+Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -174,6 +177,8 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{bran
# rev=revision ./waterfox-FreeBSD-patches-snapshot.sh
# https://github.com/MrAlex94/Waterfox/issues/1220
Source600: https://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz
+Source601: patch-bug1321069
+Source602: patch-bug1381815
Source10: waterfox-mozconfig
Source12: bgstack15-%{name}-prefs.js
@@ -207,14 +212,11 @@ Patch224: mozilla-1170092.patch
Patch225: mozilla-1005640-accept-lang.patch
#ARM run-time patch
Patch226: rhbz-1354671.patch
-Patch230: rhbz-1497932.patch
# Firefox upstream patches
Patch402: mozilla-1196777.patch
-Patch406: mozilla-256180.patch
Patch413: mozilla-1353817.patch
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch416: bug1375074-save-restore-x28.patch
Patch417: mozilla-1436242.patch
Patch418: https://hg.mozilla.org/integration/autoland/raw-rev/342812d23eb9#/mozilla-1336978.patch
Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch
@@ -223,6 +225,7 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo
# 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
@@ -416,20 +419,19 @@ This package contains results of tests executed during build.
%ifarch aarch64
%patch226 -p1 -b .1354671
%endif
-%patch230 -p1 -b .1497932
%patch402 -p1 -b .1196777
-%patch406 -p1 -b .256180
%patch413 -p1 -b .1353817
%ifarch %{arm}
%patch415 -p1 -b .mozilla-1238661
%endif
-%patch416 -p1 -b .bug1375074-save-restore-x28
%patch417 -p1 -b .mozilla-1436242
%patch418 -p1 -b .mozilla-1336978
%patch419 -p1 -b .mozilla-1320560
%patch420 -p1 -b .mozilla-1389436
+%patch450 -p1 -b .gh26459c4 -R
+
# Debian extension patch
%patch500 -p1 -b .440908
@@ -443,6 +445,7 @@ This package contains results of tests executed during build.
# Prepare FreeBSD patches
mkdir _patches
cp -p %{freebsd_root}/patch-{bug,z-bug,revert-bug}* _patches/
+cp -pf %{S:601} %{S:602} _patches/
filterdiff -x dom/svg/crashtests/crashtests.list %{freebsd_root}/patch-bug1343147 \
> _patches/patch-bug1343147
@@ -457,16 +460,20 @@ for i in 1404057 1404324 1404180 1405878 ;do
done
# 1: unneeded
-# 2: no apply
-# 3: uncertain
+# 2: unneeded
+# 3: no apply
+# 4: uncertain
for i in \
- 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1433747 1452576 1453127 1466606 \
- 1384121 1388744 1413143 \
+ 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \
+ 1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \
+ 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \
1447519
do
rm -f _patches/patch-bug${i}
done
+rm -f _patches/patch-z-bug1355143
+
patchcommand='patch -p0 -s -i'
for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do
@@ -486,6 +493,8 @@ done
%patch36 -p2 -b .xlocale
%endif
+ln -s media/test dom/test
+
cp %{SOURCE26} .
sed -e 's|_BRANCH_|%{channel}|g' -i distribution.ini
@@ -630,6 +639,12 @@ echo "ac_add_options --enable-rust-simd" >> .mozconfig
echo "ac_add_options --disable-rust-simd" >> .mozconfig
%endif
+%if 0%{?eme}
+echo "ac_add_options --enable-eme=widevine" >> .mozconfig
+%else
+echo "ac_add_options --disable-eme" >> .mozconfig
+%endif
+
# Remove executable bit to make brp-mangle-shebangs happy.
chmod -x third_party/rust/itertools/src/lib.rs
@@ -658,7 +673,7 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-RPM_SMP_MFLAGS_NCPUS=%(echo %{_smp_mflags} | sed 's|-j||')
+RPM_SMP_MFLAGS_NCPUS="%{?_smp_build_ncpus}%{!?_smp_build_ncpus:2}"
RPM_NCPUS=1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
@@ -1074,11 +1089,48 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Dec 19 2019 B Stack <bgstack15@gmail.com> - 2019.12-13.classic
+* Wed Aug 26 2020 B Stack <bgstack15@gmail.com> - 2020.08-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Tue Aug 25 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.08-1.classic
+- 2020.08
+
+* Wed Aug 05 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.07.2-1.classic
+- 2020.07.2
+
+* Wed Jul 01 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.07-1.classic
+- 2020.07
+
+* 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
+
+* Thu Apr 09 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.04-1.classic
+- 2020.04
+
+* Wed Mar 18 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.03.1-2.classic.20200313gitf6fe91c
+- gcc 10 fix
+
+* Fri Mar 13 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.03.1-2.classic.20200313gitf6fe91c
+- 2020.03.1
+
+* Sun Feb 16 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.02-2.classic.20200213gitdf884bb
+- Disable PGO again
+
+* Fri Feb 14 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.02-1.classic.20200213gitdf884bb
+- 2020.02
+- eme optional support switch, disabled by default
+
+* Thu Jan 16 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.01-2.classic.20200110git45130a2
+- PGO crash fix try #1
+
+* Wed Jan 15 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.01-1.classic.20200110git45130a2
+- New release/snapshot
+
* Thu Dec 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-3.classic
- PGO build from COPR crashing, try to fix disabling elfhack
bgstack15