wf 2022.08 rc1

4 files changed, 69 insertions, 8 deletions

diff --git a/waterfox/0001-netwerk-remove-TestURIMutator.cpp-test.patch b/waterfox/0001-netwerk-remove-TestURIMutator.cpp-test.patch
new file mode 100644
index 0000000..eb12d8c
--- /dev/null
+++ b/waterfox/0001-netwerk-remove-TestURIMutator.cpp-test.patch
@@ -0,0 +1,25 @@
+From 9fcb33feca82659a7fd6e043ec30ea4fbabdbbc3 Mon Sep 17 00:00:00 2001
+From: Phantom X <PhantomX@users.noreply.github.com>
+Date: Sun, 14 Aug 2022 11:04:17 -0300
+Subject: [PATCH] netwerk: remove TestURIMutator.cpp test
+
+Build failure
+---
+ netwerk/test/gtest/moz.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/netwerk/test/gtest/moz.build b/netwerk/test/gtest/moz.build
+index 0bfdcd4..34a06c9 100644
+--- a/netwerk/test/gtest/moz.build
++++ b/netwerk/test/gtest/moz.build
+@@ -10,7 +10,6 @@ UNIFIED_SOURCES += [
+     'TestHttpAuthUtils.cpp',
+     'TestProtocolProxyService.cpp',
+     'TestStandardURL.cpp',
+-    'TestURIMutator.cpp',
+ ]
+ 
+ include('/ipc/chromium/chromium-config.mozbuild')
+-- 
+2.37.2
+
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 117df4c..431139f 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,9 @@
+waterfox (2022.08-1+devuan) obs; urgency=medium
+
+  - latest version
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 27 Sep 2022 13:38:48 -0400
+
 waterfox (2022.06-1+devuan) obs; urgency=medium
 
   - latest version
diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc
index 3b03768..24ef110 100644
--- a/waterfox/debian/waterfox+devuan.dsc
+++ b/waterfox/debian/waterfox+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: waterfox
 Binary: waterfox
 Architecture: any
-Version: 2022.06-1+devuan
+Version: 2022.08-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.waterfox.net/
 Standards-Version: 4.1.4
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index c996f04..a2b646c 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -170,8 +170,8 @@ BuildRequires: %{scl_buildreq}
 
 Summary:        Waterfox %{channel} Web browser
 Name:           waterfox
-Version:        2022.06
-Release:        11%{?branch:.%{branch}}%{?gver}%{?dist}
+Version:        2022.08
+Release:        12%{?branch:.%{branch}}%{?gver}%{?dist}
 URL:            https://classic.waterfox.net
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -232,6 +232,11 @@ Patch419:        https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mo
 # Upstream updates/PRs/Reverts
 
 #Patch???:      %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch
+Patch450:       %{vc_url}/commit/b6078e2036773088a4a5a8883d7058f59d558b4d.patch#/%{name}-gh-b6078e2.patch
+Patch451:       %{vc_url}/commit/990a77e06e9b69110a189cabb531c43023dc251d.patch#/%{name}-gh-990a77e.patch
+Patch452:       %{vc_url}/commit/5703d785ff004b6a724ac592bd233d0398d21eef.patch#/%{name}-gh-5703d78.patch
+Patch453:       %{vc_url}/commit/3949fc4a825ca39c816d240d8912f163c232426d.patch#/%{name}-gh-3949fc4.patch
+Patch454:       %{vc_url}/commit/1f8c26a0ec9a914076654cb91a1bac57b181b37a.patch#/%{name}-gh-1f8c26a.patch
 
 # Debian patches
 Patch500:        mozilla-440908.patch
@@ -254,6 +259,7 @@ Patch706:        0001-Update-patch-bug847568.patch
 Patch707:        0001-Update-patch-bug1456512.patch
 Patch708:        0001-mbft-tests-fix-build.patch
 Patch710:        0001-testStructuredClone.cpp-Remove-testStructuredClone_i.patch
+Patch711:        0001-netwerk-remove-TestURIMutator.cpp-test.patch
 
 # Gentoo
 Patch800:        seamonkey-2.53.3-system_libvpx-1.8.patch
@@ -375,7 +381,7 @@ BuildRequires:  librsvg2
 BuildRequires:  (rust >= %{rust_build_min_ver} with rust < %{rust_build_min_nover})
 BuildRequires:  (cargo >= %{rust_build_min_ver} with cargo < %{rust_build_min_nover})
 %else
-BuildRequires:  rust
+BuildRequires:  rust >= 1.56
 BuildRequires:  cargo
 %endif
 
@@ -446,6 +452,12 @@ This package contains results of tests executed during build.
 %endif
 %patch419 -p1 -b .mozilla-1320560
 
+%patch450 -p1 -b .ghb6078e2
+%patch451 -p1 -b .gh990a77e
+%patch452 -p1 -b .gh5703d78
+%patch453 -p1 -b .gh3949fc4
+%patch454 -p1 -b .gh1f8c26a
+
 # Debian extension patch
 %patch500 -p1 -b .440908
 
@@ -487,16 +499,17 @@ for i in \
   702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \
   1395486 1396722 1398021 1399412 1401909 1411415 1412420 1417751 1418894 1419762 1425267 1427126 \
   1430508 1433747 1438425 1438645 1440943 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \
-  712130 1384121 1384701 1388744 1401063 1406396 1408397 1413143 1415883 1402442 1437450 1464872 1465108 \
+  712130 1384121 1384701 1388744 1401063 1406396 1408397 1413143 1415883 1402442 1433609 1437450 1464872 1465108 \
   1447519
 do
   rm -f _patches/patch-bug${i}
 done
 
 rm -f _patches/patch-z-bug1355143
+rm -f _patches/patch-z-bug1392739
 rm -f _patches/patch-z-bug1461619
 
-patchcommand='patch -p0 -s -i'
+patchcommand='%{__scm_apply_patch -p0 -q} -F2 -i'
 
 # Patch batch
 for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do
@@ -510,6 +523,7 @@ done
 %patch704 -p1 -b .no-diagnostics-color
 %patch708 -p1 -b .mbft-build-fix
 %patch710 -p1 -b .testStructuredClone.cpp-build-fix
+%patch711 -p1 -b .TestURIMutator.cpp-build-fix
 
 # stackrpms,2
 %if 0%{?system_libvpx}
@@ -526,6 +540,12 @@ done
 
 ln -s media/test dom/test
 
+%if 0%{?system_hunspell}
+# Fix Fedora 37 build
+ln -s ../hunspell/glue/RemoteSpellCheckEngineChild.h \
+  extensions/spellcheck/src/RemoteSpellCheckEngineChild.h
+%endif
+
 cp %{SOURCE26} .
 sed -e 's|_BRANCH_|%{channel}|g' -i distribution.ini
 
@@ -1009,7 +1029,9 @@ install -p -c -m 644 LICENSE %{buildroot}/%{mozappdir}
 
 # Use the system hunspell dictionaries
 rm -rf %{buildroot}%{mozappdir}/dictionaries
-ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
+ln -s \
+  $(realpath -m --relative-to="%{mozappdir}" "%{_datadir}")/myspell \
+  %{buildroot}%{mozappdir}/dictionaries
 
 %if %{run_tests}
 # Add debuginfo for crash-stats.mozilla.com
@@ -1121,11 +1143,19 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Jul 19 2022 B. Stack <bgstack15@gmail.com> - 2022.06-11.classic
+* Tue Sep 27 2022 B. Stack <bgstack15@gmail.com> - 2022.08-12.classic
 - add el7 and el8 support
 - repackage for stackrpms
 - disable simd globally
 
+* Tue Sep 13 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.08-2.classic
+- Upstream glibc 2.36 fix
+- Upstream rust fix
+- System spellchecker fix
+
+* Sun Aug 14 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.08-1.classic
+- 2022.08
+
 * Fri Jul 08 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.06-1.classic
 - 2022.06