Add additional patches for future

2 files changed, 32 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9659185df7bc..585508674c6d 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 = 2.7
-	pkgrel = 0
+	pkgrel = 1
 	url = https://www.waterfox.net/
 	arch = x86_64
 	license = MPL
@@ -45,19 +45,22 @@ pkgbase = waterfox-g3-kpe
 	options = !makeflags
 	options = zipman
 	source = git+https://github.com/MrAlex94/Waterfox.git#commit=78bd31b84483c4cda5f6eaa981b03f2b0c6ed9ea
-	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/waterfox-g3.desktop
-	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/distribution.ini
-	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/vendor.js
-	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/waterfox-g3.1
-	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/syspref.js
-	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/g3-kde.patch
-	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
-	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/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/d09d16bec8400e5d6bc33f6f6520391df18cde1a/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/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/sandbox-fips.patch
-	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/remoting-name.patch
-	source = rust_1.56_p1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/rust_1.56_p1.patch
-	source = rust_1.56_p2.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/d09d16bec8400e5d6bc33f6f6520391df18cde1a/waterfox-g3-kpe/patches/rust_1.56_p2.patch
+	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/waterfox-g3.desktop
+	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/distribution.ini
+	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/vendor.js
+	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/waterfox-g3.1
+	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/syspref.js
+	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/g3-kde.patch
+	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
+	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/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/b0f1edf7fb5512950f7098ff152985f9977cc830/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/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/sandbox-fips.patch
+	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/remoting-name.patch
+	source = rust_1.56_p1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/rust_1.56_p1.patch
+	source = rust_1.56_p2.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/rust_1.56_p2.patch
+	source = icecat-glibc-dynstack.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/icecat-glibc-dynstack.patch
+	source = mozilla-1715254_glibc_2.34.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/mozilla-1715254_glibc_2.34.patch
+	source = mozilla-1707096.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/b0f1edf7fb5512950f7098ff152985f9977cc830/waterfox-g3-kpe/patches/mozilla-1707096.patch
 	sha256sums = SKIP
 	sha256sums = 6e86d11bd147e6ea29118c6f5e4d1cd7376ffb61feca25979d6996731b6b663d
 	sha256sums = bf06887c00bbc7176f452a3d18092e1b222731218e461782b2877cba938aaa26
@@ -72,6 +75,9 @@ pkgbase = waterfox-g3-kpe
 	sha256sums = ac5199b397d1fef75d952eedbedcf3806b12f86b64ea29e5b34b541b0cfbe761
 	sha256sums = 081afa8b115dc7208316ed04846ae726ace68b999d55f2429cb3a9f9828585a1
 	sha256sums = e046c9b17c0b662be898030dacf01d38feb6ab875775999d6c52fc245759299d
+	sha256sums = ed78168ec6a2f9a5d278c613383067faf0fabf77dda909c732095f261188f6d0
+	sha256sums = 121fb82cc614bc3f9d10bdadd026d8099fcd9455510c565d58fae00d37fca043
+	sha256sums = f8742d4b468391f44178f480a8f711961137e11470046157bb39549de5602854
 
 pkgname = waterfox-g3-kpe
 	optdepends = networkmanager: Location detection via available WiFi networks
diff --git a/PKGBUILD b/PKGBUILD
index 4b1a0429cc4a..686d15e06a10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=waterfox-g3-kpe
 pkgver=2.7
-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=d09d16bec8400e5d6bc33f6f6520391df18cde1a
+_filesrev=b0f1edf7fb5512950f7098ff152985f9977cc830
 _filesurl=https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/$_filesrev/waterfox-g3-kpe
 _commit=78bd31b84483c4cda5f6eaa981b03f2b0c6ed9ea
 #"git+https://github.com/MrAlex94/Waterfox.git#tag=G3.$pkgver"
@@ -31,6 +31,9 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "remoting-name.patch::$_filesurl/patches/remoting-name.patch"
         "rust_1.56_p1.patch::$_filesurl/patches/rust_1.56_p1.patch"
         "rust_1.56_p2.patch::$_filesurl/patches/rust_1.56_p2.patch"
+        "icecat-glibc-dynstack.patch::$_filesurl/patches/icecat-glibc-dynstack.patch"
+        "mozilla-1715254_glibc_2.34.patch::$_filesurl/patches/mozilla-1715254_glibc_2.34.patch"
+        "mozilla-1707096.patch::$_filesurl/patches/mozilla-1707096.patch"
         )
 sha256sums=('SKIP'
             '6e86d11bd147e6ea29118c6f5e4d1cd7376ffb61feca25979d6996731b6b663d'
@@ -45,7 +48,10 @@ sha256sums=('SKIP'
             '809c7dea066cb2ba70fb1c16c1b3dcd69c7e7715f354daf2f1c67af757e6d47b'
             'ac5199b397d1fef75d952eedbedcf3806b12f86b64ea29e5b34b541b0cfbe761'
             '081afa8b115dc7208316ed04846ae726ace68b999d55f2429cb3a9f9828585a1'
-            'e046c9b17c0b662be898030dacf01d38feb6ab875775999d6c52fc245759299d')
+            'e046c9b17c0b662be898030dacf01d38feb6ab875775999d6c52fc245759299d'
+            'ed78168ec6a2f9a5d278c613383067faf0fabf77dda909c732095f261188f6d0'
+            '121fb82cc614bc3f9d10bdadd026d8099fcd9455510c565d58fae00d37fca043'
+            'f8742d4b468391f44178f480a8f711961137e11470046157bb39549de5602854')
 
 prepare() {
 
@@ -60,6 +66,9 @@ prepare() {
   patch -Np1 -i ../remoting-name.patch
   patch -Np1 -i ../rust_1.56_p1.patch
   patch -Np1 -i ../rust_1.56_p2.patch
+  patch -Np1 -i ../icecat-glibc-dynstack.patch
+  patch -Np1 -i ../mozilla-1715254_glibc_2.34.patch
+  patch -Np1 -i ../mozilla-1707096.patch
 
   cat >../mozconfig <<END
 export CC=clang