Update to 5.9.6

3 files changed, 20 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0a023758f77..7f5fd0e182ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eso-logs-uploader-bin
 	pkgdesc = Official log uploader application for esologs.com
-	pkgver = 5.9.5
+	pkgver = 5.9.6
 	pkgrel = 1
 	url = https://github.com/RPGLogs/Uploaders-esologs
 	arch = any
@@ -11,13 +11,13 @@ pkgbase = eso-logs-uploader-bin
 	provides = eso-logs-uploader
 	conflicts = eso-logs-uploader
 	options = !strip
-	source = eso-logs-uploader-5.9.5.AppImage::https://github.com/RPGLogs/Uploaders-esologs/releases/download/v5.9.5/ESO-Logs-Uploader-5.9.5.AppImage
+	source = eso-logs-uploader-5.9.6.AppImage::https://github.com/RPGLogs/Uploaders-esologs/releases/download/v5.9.6/ESO-Logs-Uploader-5.9.6.AppImage
 	source = eso-logs-uploader.sh
 	source = no-devtools.patch
 	source = no-ads.patch
-	sha256sums = e306383fcad5a172626c955b95c44ff949f6a460e79591a334622346bc719d46
+	sha256sums = 8abbf6e5ffba92febbc31e51a4edda1e9ccd2225e1a13ae50a84f4f415efa53e
 	sha256sums = 6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239
 	sha256sums = 0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287
-	sha256sums = 53c3b564c22088ba45bc6c6a9c6e0c7cf9be126caad9cb77cf88f85973701df0
+	sha256sums = 9df84f23e7c397d25011c67a68aa6ec4ff1598af71ec38f9a9e7113d1ac58598
 
 pkgname = eso-logs-uploader-bin
diff --git a/PKGBUILD b/PKGBUILD
index e9e32086b2ee..fb8b6ca7f72d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgname=eso-logs-uploader-bin
-pkgver=5.9.5
+pkgver=5.9.6
 pkgrel=1
 pkgdesc="Official log uploader application for esologs.com"
 arch=('any')
@@ -16,10 +16,10 @@ source=("${pkgname%-bin}-$pkgver.AppImage::$url/releases/download/v$pkgver/ESO-L
         'eso-logs-uploader.sh'
         'no-devtools.patch'
         'no-ads.patch')
-sha256sums=('e306383fcad5a172626c955b95c44ff949f6a460e79591a334622346bc719d46'
+sha256sums=('8abbf6e5ffba92febbc31e51a4edda1e9ccd2225e1a13ae50a84f4f415efa53e'
             '6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239'
             '0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287'
-            '53c3b564c22088ba45bc6c6a9c6e0c7cf9be126caad9cb77cf88f85973701df0')
+            '9df84f23e7c397d25011c67a68aa6ec4ff1598af71ec38f9a9e7113d1ac58598')
 
 prepare() {
     cd "$srcdir"
@@ -32,8 +32,8 @@ prepare() {
     sed -i 's/^\(Exec=\).*$/\1eso-logs-uploader/' "squashfs-root/esologs.desktop"
 
     cd "${pkgname%-bin}"
-    patch -p1 < "$srcdir/no-devtools.patch"
     patch -p1 < "$srcdir/no-ads.patch"
+    patch -p1 < "$srcdir/no-devtools.patch"
 }
 
 package() {
diff --git a/no-ads.patch b/no-ads.patch
index 0629a5ef2c77..e00fd856c20a 100644
--- a/no-ads.patch
+++ b/no-ads.patch
@@ -1,3 +1,15 @@
+diff -ruN a/main.js b/main.js
+--- a/main.js	2022-11-19 12:15:47.180054024 +0100
++++ b/main.js	2022-11-19 12:21:38.458818923 +0100
+@@ -92,8 +92,6 @@
+       nodeIntegration: true,
+       webviewTag: true,
+       contextIsolation: false,
+-      // Some ads load over HTTP instead of HTTPS :(
+-      webSecurity: false,
+     },
+   };
+ 
 diff -ruN a/main-view.js b/main-view.js
 --- a/main-view.js	2022-05-28 14:17:42.739111678 +0200
 +++ b/main-view.js	2022-05-28 14:50:14.227972642 +0200