diff options
author | jkhsjdhjs | 2023-04-05 19:58:57 +0200 |
---|---|---|
committer | jkhsjdhjs | 2023-04-05 19:58:57 +0200 |
commit | 1ce79493ee1bda82b1771e618e572135ab5b3e42 (patch) | |
tree | 9066c6e9078ebd41a1c475d7bf4e3ef9f1408844 | |
parent | b72c59ee68c0d8454593786b799432c2b963d499 (diff) | |
download | aur-eso-logs-uploader-bin.tar.gz |
Update to 6.0.2
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | no-ads.patch | 77 |
3 files changed, 53 insertions, 38 deletions
@@ -1,6 +1,6 @@ pkgbase = eso-logs-uploader-bin pkgdesc = Official log uploader application for esologs.com - pkgver = 6.0.1 + pkgver = 6.0.2 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-6.0.1.AppImage::https://github.com/RPGLogs/Uploaders-esologs/releases/download/v6.0.1/ESO-Logs-Uploader-6.0.1.AppImage + source = eso-logs-uploader-6.0.2.AppImage::https://github.com/RPGLogs/Uploaders-esologs/releases/download/v6.0.2/ESO-Logs-Uploader-6.0.2.AppImage source = eso-logs-uploader.sh source = no-devtools.patch source = no-ads.patch - sha256sums = 25f9164d5b36b35c3a2a147c85a55b8c9d25809954b832d8d4eb967870e1df3f + sha256sums = c7863585a50940c0ddae42b78e0135a389b58a80aca684dcbef4c38da85e5ec4 sha256sums = 6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239 sha256sums = 0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287 - sha256sums = 9df84f23e7c397d25011c67a68aa6ec4ff1598af71ec38f9a9e7113d1ac58598 + sha256sums = 8f237793b9ee25cfe8d842f5ab77921ecaa2e701aa52af239691f5f8f80fbbf6 pkgname = eso-logs-uploader-bin @@ -1,7 +1,7 @@ # Maintainer: Leon Möller <jkhsjdhjs at totally dot rip> pkgname=eso-logs-uploader-bin -pkgver=6.0.1 +pkgver=6.0.2 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=('25f9164d5b36b35c3a2a147c85a55b8c9d25809954b832d8d4eb967870e1df3f' +sha256sums=('c7863585a50940c0ddae42b78e0135a389b58a80aca684dcbef4c38da85e5ec4' '6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239' '0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287' - '9df84f23e7c397d25011c67a68aa6ec4ff1598af71ec38f9a9e7113d1ac58598') + '8f237793b9ee25cfe8d842f5ab77921ecaa2e701aa52af239691f5f8f80fbbf6') prepare() { cd "$srcdir" diff --git a/no-ads.patch b/no-ads.patch index e00fd856c20a..74631ebe2923 100644 --- a/no-ads.patch +++ b/no-ads.patch @@ -1,18 +1,7 @@ -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 +diff --git a/main-view.js b/main-view.js +index 58214aa..73bb9d8 100644 +--- a/main-view.js ++++ b/main-view.js @@ -1,6 +1,5 @@ const { dialog } = require('@electron/remote'); const { BaseAppView } = require('./base-app-view'); @@ -20,7 +9,7 @@ diff -ruN a/main-view.js b/main-view.js const { ExternalLinkService, } = require('./scripts/services/external-link-service'); -@@ -85,7 +84,6 @@ +@@ -85,7 +84,6 @@ class MainView extends BaseAppView { this._mainWindow = mainWindow; @@ -28,7 +17,7 @@ diff -ruN a/main-view.js b/main-view.js this._externalLinkService = new ExternalLinkService(); this._mainWindow.game.desktopContentLoaded?.(document); -@@ -356,12 +354,6 @@ +@@ -356,12 +354,6 @@ class MainView extends BaseAppView { this.selectRegion(user.preferredRegion.id, true); } @@ -41,7 +30,7 @@ diff -ruN a/main-view.js b/main-view.js this._mainWindow.canUseRealTimeLiveLogging = user.canUseRealTimeLiveLogging; if (this._onboarded) { -@@ -734,7 +726,6 @@ +@@ -734,7 +726,6 @@ class MainView extends BaseAppView { }; fillInLoginForm = () => { @@ -49,7 +38,7 @@ diff -ruN a/main-view.js b/main-view.js document.getElementById('startup-panel').style.display = 'none'; document.getElementById('logincontent').style.display = ''; document.getElementById('email').value = this._mainWindow.userName; -@@ -846,7 +837,6 @@ +@@ -846,7 +837,6 @@ class MainView extends BaseAppView { </div>`); $('body').append(settingsElement); @@ -57,7 +46,7 @@ diff -ruN a/main-view.js b/main-view.js const closeOverwolfControlElement = $( '.settings__close-overwolf-control' -@@ -873,7 +863,6 @@ +@@ -873,7 +863,6 @@ class MainView extends BaseAppView { $('.settings__done-button').on('click', async () => { settingsElement.remove(); @@ -65,9 +54,35 @@ diff -ruN a/main-view.js b/main-view.js }); }); }; -diff -ruN a/scripts/services/ad-service.js b/scripts/services/ad-service.js ---- a/scripts/services/ad-service.js 2022-05-28 14:17:42.739111678 +0200 -+++ b/scripts/services/ad-service.js 1970-01-01 01:00:00.000000000 +0100 +diff --git a/main.js b/main.js +index fa0a3f7..3e5b2c7 100755 +--- a/main.js ++++ b/main.js +@@ -92,8 +92,6 @@ async function createWindow() { + nodeIntegration: true, + webviewTag: true, + contextIsolation: false, +- // Some ads load over HTTP instead of HTTPS :( +- webSecurity: false, + }, + }; + +diff --git a/roots/electron-main-view-root.js b/roots/electron-main-view-root.js +index b0120bb..ee1405d 100644 +--- a/roots/electron-main-view-root.js ++++ b/roots/electron-main-view-root.js +@@ -1,6 +1,5 @@ + const { dialog } = require('@electron/remote'); + const { BaseAppView } = require('./base-app-view'); +-const { AdService } = require('./scripts/services/ad-service'); + const { + ExternalLinkService, + } = require('./scripts/services/external-link-service'); +diff --git a/scripts/services/ad-service.js b/scripts/services/ad-service.js +deleted file mode 100644 +index 0ef3ae3..0000000 +--- a/scripts/services/ad-service.js ++++ /dev/null @@ -1,44 +0,0 @@ -let adsEnabled = false; - @@ -76,14 +91,14 @@ diff -ruN a/scripts/services/ad-service.js b/scripts/services/ad-service.js - if (!adsEnabled || !adContainer || adContainer.style.display !== 'none') - return; - adContainer.style.display = 'flex'; -- adContainer.innerHTML = -- "<webview allowpopups httpreferrer='" + -- window.game.host() + -- "' style='flex:1' id='electron-ad-view' src='" + -- window.game.scheme() + -- '://' + -- window.game.host() + -- "/client/ad'></webview>"; +- const webview = document.createElement('webview'); +- webview.allowpopups = true; +- webview.httpreferrer = window.game.host(); +- webview.style.flex = "1"; +- webview.id = 'electron-ad-view'; +- webview.src = `${window.game.scheme()}://${window.game.host()}/client/ad`; +- webview.addEventListener('dom-ready', (event) => event.target?.setAudioMuted(true)); +- adContainer.appendChild(webview); -}; - -const pauseAds = () => { |