Update

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4453f8b55625..5be01e776b5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waterfox-g3-kpe
 	pkgdesc = Customizable privacy conscious web browser with better integration with KDE and primary support for webextensions
-	pkgver = 2.4.1
+	pkgver = 2.5
 	pkgrel = 0
 	url = https://www.waterfox.net/
 	arch = x86_64
@@ -44,18 +44,18 @@ pkgbase = waterfox-g3-kpe
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#tag=G3.2.4.1
-	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/waterfox-g3.desktop
-	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/distribution.ini
-	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/vendor.js
-	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/waterfox-g3.1
-	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/syspref.js
-	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/patches/g3-kde.patch
-	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
-	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/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/2a0b88ee80b2ec6bbd4642290402392185570f52/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/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/patches/sandbox-fips.patch
-	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/2a0b88ee80b2ec6bbd4642290402392185570f52/waterfox-g3-kpe/patches/remoting-name.patch
+	source = git+https://github.com/MrAlex94/Waterfox.git#tag=G3.2.5
+	source = waterfox-g3.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/waterfox-g3.desktop
+	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/distribution.ini
+	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/vendor.js
+	source = waterfox-g3.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/waterfox-g3.1
+	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/syspref.js
+	source = g3-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/patches/g3-kde.patch
+	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/patches/mozilla-nongnome-proxies.patch
+	source = mozilla-ntlm-full-path.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/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/22307ab353f68d777ea1ce0881a7fdc55a06a26b/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/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/patches/sandbox-fips.patch
+	source = remoting-name.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/22307ab353f68d777ea1ce0881a7fdc55a06a26b/waterfox-g3-kpe/patches/remoting-name.patch
 	sha256sums = SKIP
 	sha256sums = 6e86d11bd147e6ea29118c6f5e4d1cd7376ffb61feca25979d6996731b6b663d
 	sha256sums = bf06887c00bbc7176f452a3d18092e1b222731218e461782b2877cba938aaa26
@@ -76,4 +76,4 @@ pkgname = waterfox-g3-kpe
 	optdepends = alsa-lib: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = waterfox-g3=2.4.1
+	provides = waterfox-g3=2.5
diff --git a/PKGBUILD b/PKGBUILD
index c0185067b5a5..bf3584f0ee10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: hawkeye116477 <hawkeye116477 at gmail dot com>
 
 pkgname=waterfox-g3-kpe
-pkgver=2.4.1
+pkgver=2.5
 pkgrel=0
 pkgdesc="Customizable privacy conscious web browser with better integration with KDE and primary support for webextensions"
 arch=('x86_64')
@@ -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=2a0b88ee80b2ec6bbd4642290402392185570f52
+_filesrev=22307ab353f68d777ea1ce0881a7fdc55a06a26b
 _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"
@@ -158,9 +158,7 @@ ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
   ./mach build
 
-# Build langpacks
-#   mkdir -p "${srcdir}"/waterfox-g3-kpe-$pkgver/langpacks/
-
+  # Build langpacks
 #   cat > ../mozconfig_LANG <<END
 # ac_add_options --with-app-name=waterfox-g3
 # ac_add_options --with-app-basename=Waterfox
@@ -179,8 +177,8 @@ END
 #         sed -i "s|obj_LANG|obj_$locale|" ${PWD}/mozconfig_$locale
 #         export MOZCONFIG=${PWD}/mozconfig_$locale
 #         ./mach build config/nsinstall langpack-$locale
-#         cp -L ../obj_$locale/dist/linux-*/xpi/waterfox-g3-$(<browser/config/version.txt).$locale.langpack.xpi \
-#             ${PWD}/langpacks/langpack-$locale@l10n.waterfox.net.xpi
+#         cp -L ../obj_$locale/dist/linux-*/xpi/waterfox-g3-$(<browser/config/version_display.txt).$locale.langpack.xpi \
+#             ${PWD}/langpack-$locale@l10n.waterfox.net.xpi
 # ' -- {}
 }
 
@@ -240,9 +238,9 @@ END
   cp "$srcdir/syspref.js" "$pkgdir/etc/waterfox-g3/"
   ln -Tsf /etc/waterfox-g3/syspref.js "$pkgdir/usr/lib/waterfox-g3/browser/defaults/preferences/syspref.js"
 
-  # Add langpacks
-  # mkdir -p "$pkgdir/usr/lib/waterfox-g3/browser/extensions/"
-  # cp "${srcdir}"/waterfox-g3-kpe-$pkgver/langpacks/*.xpi "$pkgdir/usr/lib/waterfox-g3/browser/extensions/"
+#   # Add langpacks
+#   mkdir -p "$pkgdir/usr/lib/waterfox-g3/browser/extensions/"
+#   cp "${srcdir}"/waterfox-g3-kpe-$pkgver/*.xpi "$pkgdir/usr/lib/waterfox-g3/browser/extensions/"
 }
 
 # vim: set ts=2 sw=2 et syn=sh ft=sh: