Remove browser detection patch

3 files changed, 2 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 130272cc4a19..57ff56e33eba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = threema-desktop
 	pkgdesc = Threema Desktop (Threema Web in Electron).
 	pkgver = 1.2.25
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/threema-ch/threema-web-electron
 	arch = any
 	license = AGPL
@@ -11,10 +11,8 @@ pkgbase = threema-desktop
 	source = threema-web-electron-v1.2.25.tar.gz::https://github.com/threema-ch/threema-web-electron/archive/refs/tags/1.2.25.tar.gz
 	source = threema-web-v2.4.4.tar.gz::https://github.com/threema-ch/threema-web/archive/refs/tags/v2.4.4.tar.gz
 	source = threema.desktop
-	source = 0001-Remove-browser-warning.patch
 	sha256sums = 428f01a791f5e8d6161cae3f2ac604df5d78a493e75c25ed88d96f527b2aa32c
 	sha256sums = 82b4bc5ac2cfde8c3f6ee79f3d90ebb6a395c1db7969756493ab18b321f89783
 	sha256sums = ccfdae3416e2a1f096cfaf67fd8f8dacb0d8348582fc666ecc8b5b0d08ef5bf2
-	sha256sums = 75be30059dab96e015a9030477c3a7e55584b408761f9c50a9491d1bed152c78
 
 pkgname = threema-desktop
diff --git a/0001-Remove-browser-warning.patch b/0001-Remove-browser-warning.patch
deleted file mode 100644
index 1e3c86a3092e..000000000000
--- a/0001-Remove-browser-warning.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b57759918627e0b26b3cdac367c3046bceef0406 Mon Sep 17 00:00:00 2001
-From: Danilo Bargen <danilo.bargen@threema.ch>
-Date: Thu, 4 Aug 2022 10:22:20 +0200
-Subject: [PATCH] Remove browser warning
-
----
- src/partials/welcome.ts | 34 ----------------------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/src/partials/welcome.ts b/src/partials/welcome.ts
-index 03a58b31..1d68efd6 100644
---- a/src/partials/welcome.ts
-+++ b/src/partials/welcome.ts
-@@ -143,40 +143,6 @@ class WelcomeController {
-         this.log.info('Detected browser:', this.browser.description());
-         if (!this.browser.wasDetermined()) {
-             this.log.warn('Could not determine browser version');
--            this.showBrowserWarning();
--        } else if (this.browser.name === threema.BrowserName.Chrome) {
--            if (version < minVersions.CHROME) {
--                this.log.warn('Chrome is too old (' + version + ' < ' + minVersions.CHROME + ')');
--                this.showBrowserWarning();
--            }
--        } else if (this.browser.name === threema.BrowserName.Firefox) {
--            if (version < minVersions.FF) {
--                this.log.warn('Firefox is too old (' + version + ' < ' + minVersions.FF + ')');
--                this.showBrowserWarning();
--            }
--        } else if (this.browser.name === threema.BrowserName.FirefoxIos) {
--            if (version < minVersions.FF_IOS) {
--                this.log.warn('Firefox on iOS is too old (WebKit ' + version + ' < ' + minVersions.FF_IOS + ')');
--                this.showBrowserWarning();
--            }
--        } else if (this.browser.name === threema.BrowserName.Opera) {
--            if (version < minVersions.OPERA) {
--                this.log.warn('Opera is too old (' + version + ' < ' + minVersions.OPERA + ')');
--                this.showBrowserWarning();
--            }
--        } else if (this.browser.name === threema.BrowserName.Safari) {
--            if (version < minVersions.SAFARI) {
--                this.log.warn('Safari is too old (' + version + ' < ' + minVersions.SAFARI + ')');
--                this.showBrowserWarning();
--            }
--        } else if (this.browser.name === threema.BrowserName.Edge) {
--            if (version < minVersions.EDGE) {
--                this.log.warn('Edge is too old (' + version + ' < ' + minVersions.EDGE + ')');
--                this.showBrowserWarning();
--            }
--        } else {
--            this.log.warn('Non-supported browser, please use Chrome, Firefox, Edge or Opera');
--            this.showBrowserWarning();
-         }
- 
-         // Determine whether local storage is available
--- 
-2.37.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d979b1a2c69d..0cfdba79b4cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _variant=consumer
 _appname="Threema"
 pkgdesc="Threema Desktop (Threema Web in Electron)."
 pkgver=1.2.25
-pkgrel=2
+pkgrel=3
 _threema_web_ver=2.4.4 # Keep in sync with version used by threema-desktop
 arch=('any')
 url="https://github.com/threema-ch/threema-web-electron"
@@ -16,18 +16,15 @@ source=(
   "threema-web-electron-v${pkgver}.tar.gz::https://github.com/threema-ch/threema-web-electron/archive/refs/tags/${pkgver}.tar.gz"
   "threema-web-v${_threema_web_ver}.tar.gz::https://github.com/threema-ch/threema-web/archive/refs/tags/v${_threema_web_ver}.tar.gz"
   "threema.desktop"
-  "0001-Remove-browser-warning.patch"
 )
 sha256sums=(
   '428f01a791f5e8d6161cae3f2ac604df5d78a493e75c25ed88d96f527b2aa32c'
   '82b4bc5ac2cfde8c3f6ee79f3d90ebb6a395c1db7969756493ab18b321f89783'
   'ccfdae3416e2a1f096cfaf67fd8f8dacb0d8348582fc666ecc8b5b0d08ef5bf2'
-  '75be30059dab96e015a9030477c3a7e55584b408761f9c50a9491d1bed152c78'
 )
 
 prepare() {
   cd "${srcdir}/threema-web-${_threema_web_ver}"
-  patch --forward --strip=1 --input="${srcdir}/0001-Remove-browser-warning.patch"
 }
 
 build() {