Remove fixed patch for ferdi-git

3 files changed, 3 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 953d77f2b19b..0c07d073889c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ferdi-git
 	pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application - git version
-	pkgver = 5.6.0.beta.5.r150.g0aaaaeb1
+	pkgver = 5.6.0.beta.5.r222.gb88d312c
 	pkgrel = 1
 	url = https://getferdi.com
 	arch = x86_64
@@ -21,11 +21,9 @@ pkgbase = ferdi-git
 	source = ferdi-git-recipes::git+https://github.com/getferdi/recipes
 	source = ferdi-git-internal-server::git+https://github.com/getferdi/internal-server
 	source = fix-autostart-path.diff
-	source = remove-mac-screen-capture-permissions.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 7eb846fe8242c78afcdef9c8e1fbce6fdcf100f59da85fee83a99690a57f60ea
-	sha256sums = 306321dfaa62710bff49fb289d192fea24b369f1d34845cc8db9d626b4b9b68f
 
 pkgname = ferdi-git
diff --git a/PKGBUILD b/PKGBUILD
index 7386705b00f7..5f9e8876bd41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
 _pkgname='ferdi'
 pkgname="$_pkgname-git"
-pkgver='5.6.0.beta.5.r150.g0aaaaeb1'
+pkgver='5.6.0.beta.5.r222.gb88d312c'
 pkgrel='1'
 pkgdesc='A messaging browser that allows you to combine your favorite messaging services into one application - git version'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
@@ -20,13 +20,11 @@ source=(
 	"$pkgname-recipes::git+https://github.com/get$_pkgname/recipes"
 	"$pkgname-internal-server::git+https://github.com/get$_pkgname/internal-server"
 	'fix-autostart-path.diff'
-	'remove-mac-screen-capture-permissions.diff'
 )
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            '7eb846fe8242c78afcdef9c8e1fbce6fdcf100f59da85fee83a99690a57f60ea'
-            '306321dfaa62710bff49fb289d192fea24b369f1d34845cc8db9d626b4b9b68f')
+            '7eb846fe8242c78afcdef9c8e1fbce6fdcf100f59da85fee83a99690a57f60ea')
 
 _sourcedirectory="$pkgname"
 _homedirectory="$pkgname-home"
@@ -64,7 +62,6 @@ prepare() {
 
 	# Specify path for autostart file
 	patch --forward -p1 < '../fix-autostart-path.diff'
-	patch --forward -p1 < '../remove-mac-screen-capture-permissions.diff'
 
 	# Build recipe archives
 	cd "$srcdir/$_sourcedirectory/recipes/"
diff --git a/remove-mac-screen-capture-permissions.diff b/remove-mac-screen-capture-permissions.diff
deleted file mode 100644
index d264fdd29a20..000000000000
--- a/remove-mac-screen-capture-permissions.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/electron-builder.yml b/electron-builder.yml
-index 7091dfb7..7400d348 100644
---- a/electron-builder.yml
-+++ b/electron-builder.yml
-@@ -61,5 +61,4 @@ protocols:
- 
- asarUnpack:
-   - ./recipes
--  - ./node_modules/mac-screen-capture-permissions
-   - ./assets/images/taskbar
-\ No newline at end of file
-diff --git a/package.json b/package.json
-index 2eafe780..510356f4 100644
---- a/package.json
-+++ b/package.json
-@@ -90,7 +90,6 @@
-     "hex-to-rgba": "1.0.2",
-     "jsonwebtoken": "8.5.1",
-     "lodash": "4.17.21",
--    "mac-screen-capture-permissions": "1.1.0",
-     "macos-version": "5.2.0",
-     "marked": "0.7.0",
-     "mdi": "^1.9.33",
-diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
-index 4ba6a761..922ced38 100644
---- a/src/electron/macOSPermissions.js
-+++ b/src/electron/macOSPermissions.js
-@@ -1,8 +1,6 @@
- import { systemPreferences } from 'electron';
--import {
--  hasScreenCapturePermission,
--  hasPromptedForPermission,
--} from 'mac-screen-capture-permissions';
-+const hasScreenCapturePermission = () => true;
-+const hasPromptedForPermission = () => true;
- 
- export default function () {
-   systemPreferences.askForMediaAccess('camera');