Please, no crashes. Thanks :-)

2 files changed, 27 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 110153554bd0..b6657e50472d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = waterfox-g3-kpe
 	pkgdesc = Customizable privacy conscious web browser with better integration with KDE and primary support for webextensions
 	pkgver = 1.1
-	pkgrel = 0
+	pkgrel = 1
 	url = https://www.waterfox.net/
 	arch = x86_64
 	license = MPL
@@ -45,17 +45,19 @@ pkgbase = waterfox-g3-kpe
 	options = !makeflags
 	options = zipman
 	source = git+https://github.com/MrAlex94/Waterfox.git#tag=G3.1.1
-	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/waterfox-g3.desktop
-	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/distribution.ini
-	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/vendor.js
-	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/waterfox-g3.1
-	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/syspref.js
-	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/g3-kde.patch
-	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
-	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/mozilla-ntlm-full-path.patch
-	source = Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/Use-remoting-name-for-GDK-application-names.patch
-	source = sandbox-fips.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/sandbox-fips.patch
-	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/e0d8363e58ed288cd10caabb34c1ce153262e045/waterfox-g3-kpe/patches/remoting-name.patch
+	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/waterfox-g3.desktop
+	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/distribution.ini
+	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/vendor.js
+	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/waterfox-g3.1
+	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/syspref.js
+	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/g3-kde.patch
+	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
+	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/mozilla-ntlm-full-path.patch
+	source = Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/Use-remoting-name-for-GDK-application-names.patch
+	source = sandbox-fips.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/sandbox-fips.patch
+	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/remoting-name.patch
+	source = bmo1680166_p1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/bmo1680166_p1.patch
+	source = bmo1680166_p2.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/5f0d17e742be7f8675cb5f8092403ee7679f3855/waterfox-g3-kpe/patches/bmo1680166_p2.patch
 	sha256sums = SKIP
 	sha256sums = 6d37d08ee522173057918de8ad8394ba62b61a38c102cb03439d257a93e4b4a6
 	sha256sums = bf06887c00bbc7176f452a3d18092e1b222731218e461782b2877cba938aaa26
@@ -68,6 +70,8 @@ pkgbase = waterfox-g3-kpe
 	sha256sums = 71386c2e269bd021c3b8c86b457101bdb730f76db3f2bbb91bf617109564a09c
 	sha256sums = 809c7dea066cb2ba70fb1c16c1b3dcd69c7e7715f354daf2f1c67af757e6d47b
 	sha256sums = ac5199b397d1fef75d952eedbedcf3806b12f86b64ea29e5b34b541b0cfbe761
+	sha256sums = 005662a42e8c37027d8c64bbb2db9c1d8bce315dbdca2d9a489d5084dfa87bf9
+	sha256sums = 9a04633df4ed595701b81abc13ca21ca86855ce7e69918ff8cc5c8138aa6a7d4
 
 pkgname = waterfox-g3-kpe
 	optdepends = networkmanager: Location detection via available WiFi networks
diff --git a/PKGBUILD b/PKGBUILD
index 169fe82e45f8..eb66c875c4ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=waterfox-g3-kpe
 pkgver=1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Customizable privacy conscious web browser with better integration with KDE and primary support for webextensions"
 arch=('x86_64')
 license=('MPL')
@@ -13,7 +13,7 @@ makedepends=('unzip' 'zip' 'diffutils' 'python' 'yasm' 'mesa' 'imake' 'inetutils
              'autoconf2.13' 'rust' 'clang' 'llvm' 'libpulse' 'alsa-lib' 'jack' 'cbindgen' 'nasm' 'python-setuptools'
              'nodejs' 'python-psutil' 'binutils' 'git')
 options=('!emptydirs' '!makeflags' 'zipman')
-_filesrev=e0d8363e58ed288cd10caabb34c1ce153262e045
+_filesrev=5f0d17e742be7f8675cb5f8092403ee7679f3855
 _filesurl=https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/$_filesrev/waterfox-g3-kpe
 _commit=11befa20d8c009ee5eaeb44bb3b586de9390bfcd
 #"git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
@@ -29,6 +29,8 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#tag=G3.$pkgver"
         "Use-remoting-name-for-GDK-application-names.patch::$_filesurl/patches/Use-remoting-name-for-GDK-application-names.patch"
         "sandbox-fips.patch::$_filesurl/patches/sandbox-fips.patch"
         "remoting-name.patch::$_filesurl/patches/remoting-name.patch"
+        "bmo1680166_p1.patch::$_filesurl/patches/bmo1680166_p1.patch"
+        "bmo1680166_p2.patch::$_filesurl/patches/bmo1680166_p2.patch"
         )
 sha256sums=('SKIP'
             '6d37d08ee522173057918de8ad8394ba62b61a38c102cb03439d257a93e4b4a6'
@@ -41,7 +43,9 @@ sha256sums=('SKIP'
             '25846888b48208606ff88c04dc8b9cb5b1a9c433adfd2d72ce13b6b9edc73a87'
             '71386c2e269bd021c3b8c86b457101bdb730f76db3f2bbb91bf617109564a09c'
             '809c7dea066cb2ba70fb1c16c1b3dcd69c7e7715f354daf2f1c67af757e6d47b'
-            'ac5199b397d1fef75d952eedbedcf3806b12f86b64ea29e5b34b541b0cfbe761')
+            'ac5199b397d1fef75d952eedbedcf3806b12f86b64ea29e5b34b541b0cfbe761'
+            '005662a42e8c37027d8c64bbb2db9c1d8bce315dbdca2d9a489d5084dfa87bf9'
+            '9a04633df4ed595701b81abc13ca21ca86855ce7e69918ff8cc5c8138aa6a7d4')
 
 prepare() {
 
@@ -55,6 +59,10 @@ prepare() {
   patch -Np1 -i ../sandbox-fips.patch
   patch -Np1 -i ../remoting-name.patch
 
+  # Prevent sandbox crashing when building with rustc >= 1.48
+  patch -Np1 -i ../bmo1680166_p1.patch
+  patch -Np1 -i ../bmo1680166_p2.patch
+
   cat >../mozconfig <<END
 export CC=clang
 export CXX=clang++