From 6e3a7a3ca508ae0c0dcf3c001c7b5e1db8d91cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Tue, 9 Apr 2024 12:07:40 +0200
Subject: [PATCH 1/4] upgpkg: discord-electron 0.0.48-2: update electron, mod
 compat

* Update Electron version to 29
* Move asar to resources subfolder for Discord client mod compatibility
---
 discord-electron/.SRCINFO            |  8 ++++----
 discord-electron/PKGBUILD            | 10 +++++-----
 discord-electron/discord-launcher.sh |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO
index bfcd37d..359e633 100644
--- a/discord-electron/.SRCINFO
+++ b/discord-electron/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron
-	pkgdesc = Discord using system provided electron (v28) for increased security and performance
+	pkgdesc = Discord using system provided electron (v29) for increased security and performance
 	pkgver = 0.0.48
-	pkgrel = 1
+	pkgrel = 2
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = discord-electron
 	makedepends = asar
 	makedepends = curl
 	makedepends = python-html2text
-	depends = electron28
+	depends = electron29
 	depends = libxss
 	optdepends = libpulse: Pulseaudio support
 	optdepends = libappindicator-gtk3: Systray indicator support
@@ -21,6 +21,6 @@ pkgbase = discord-electron
 	source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz
 	source = discord-launcher.sh
 	sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b
-	sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566
+	sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40
 
 pkgname = discord-electron
diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD
index 144d29d..acfbd3b 100644
--- a/discord-electron/PKGBUILD
+++ b/discord-electron/PKGBUILD
@@ -14,8 +14,8 @@
 pkgname=discord-electron
 _pkgname=discord
 pkgver=0.0.48
-pkgrel=1
-_electronver=28
+pkgrel=2
+_electronver=29
 _electronname="electron${_electronver}"
 pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
 arch=('x86_64')
@@ -36,7 +36,7 @@ optdepends=(
 source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
 	'discord-launcher.sh')
 sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b'
-            'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566')
+            '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40')
 
 _krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162'
 
@@ -63,7 +63,7 @@ build() {
 	asar e resources/app.asar resources/app
 	rm resources/app.asar
 	sed -i -e "/resourcesPath = .*;$/d" -e "s|return resourcesPath|return '/usr/lib/${_pkgname}'|" resources/app/common/paths.js
-	sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js
+	sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}/resources'|" resources/app/app_bootstrap/buildInfo.js
 	sed -i -e "/^const appName/d" -e "/^const exePath/d" -e "/^const exeDir/d" -e "/^const iconPath/d" \
 		-e "s|^Exec=\${exePath}$|Exec=/usr/bin/${_pkgname}|" \
 		-e "s|^Name=\${appName}$|Name=${_pkgname^}|" \
@@ -79,7 +79,7 @@ package() {
 	install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
 
 	# copy relevant data
-	cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/
+	cp -r ${_pkgname^}/resources "${pkgdir}"/usr/lib/$_pkgname/
 	cp ${_pkgname^}/$_pkgname.png \
 		"${pkgdir}"/usr/share/pixmaps/$_pkgname.png
 	cp ${_pkgname^}/$_pkgname.desktop \
diff --git a/discord-electron/discord-launcher.sh b/discord-electron/discord-launcher.sh
index 55ff2a0..c63b91c 100644
--- a/discord-electron/discord-launcher.sh
+++ b/discord-electron/discord-launcher.sh
@@ -37,6 +37,6 @@ unset flags_file krisp_bin krisp_b2
 
 
 exec /usr/lib/@ELECTRON@/electron \
-	/usr/lib/@PKGNAME@/app.asar \
+	/usr/lib/@PKGNAME@/resources/app.asar \
 	--ozone-platform-hint=auto \
 	"${flags[@]}" "$@"

From e58dddf2818368c244130963825dec06939db2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Tue, 9 Apr 2024 12:08:16 +0200
Subject: [PATCH 2/4] upgpkg: discord-electron-openasar 0.0.48+827-2: update
 electron, mod compat

* Update Electron version to 29
* Move asar to resources subfolder for Discord client mod compatibility
---
 discord-electron-openasar/.SRCINFO            |  8 ++++----
 discord-electron-openasar/PKGBUILD            | 12 ++++++------
 discord-electron-openasar/discord-launcher.sh |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/discord-electron-openasar/.SRCINFO b/discord-electron-openasar/.SRCINFO
index 0dfdd6f..19ae440 100644
--- a/discord-electron-openasar/.SRCINFO
+++ b/discord-electron-openasar/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron-openasar
-	pkgdesc = Discord packaged with OpenAsar using system provided electron (v28) for increased security and performance
+	pkgdesc = Discord packaged with OpenAsar using system provided electron (v29) for increased security and performance
 	pkgver = 0.0.48+827
-	pkgrel = 1
+	pkgrel = 2
 	url = https://discord.com
 	install = discord-electron-openasar.install
 	arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = discord-electron-openasar
 	makedepends = nodejs
 	makedepends = curl
 	makedepends = python-html2text
-	depends = electron28
+	depends = electron29
 	depends = libxss
 	depends = unzip
 	optdepends = libpulse: Pulseaudio support
@@ -25,7 +25,7 @@ pkgbase = discord-electron-openasar
 	source = discord-launcher.sh
 	source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d
 	sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b
-	sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566
+	sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40
 	sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849
 
 pkgname = discord-electron-openasar
diff --git a/discord-electron-openasar/PKGBUILD b/discord-electron-openasar/PKGBUILD
index 23291f3..f4ce55c 100644
--- a/discord-electron-openasar/PKGBUILD
+++ b/discord-electron-openasar/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=discord-electron-openasar
 _pkgname=discord
 pkgver=0.0.48+827
 _pkgver=${pkgver%%+*}
-pkgrel=1
-_electronver=28
+pkgrel=2
+_electronver=29
 _electronname="electron${_electronver}"
 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
 arch=('x86_64')
@@ -31,7 +31,7 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.
 	'discord-launcher.sh'
 	"git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d")
 sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b'
-            'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566'
+            '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40'
             '055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849')
 
 _krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162'
@@ -64,7 +64,7 @@ build() {
 	# pack openasar
 	sed -i -e "s|nightly|nightly-$(git rev-parse HEAD | cut -c 1-7)|" src/index.js
 	sed -i -e "/config.setup = true/a\  config.autoupdate = false;" src/config/index.js
-	sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" src/utils/buildInfo.js
+	sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}/resources'|" src/utils/buildInfo.js
 	sed -i -e "s|^Exec=\${exec}$|Exec=/usr/bin/${_pkgname}|" \
 		-e "s|^Name=\${basename(exec)}$|Name=${_pkgname^}|" src/autoStart.js
 	node scripts/strip.js
@@ -77,14 +77,14 @@ package() {
 	install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
 
 	# copy relevant data
-	cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/
+	cp -r ${_pkgname^}/resources "${pkgdir}"/usr/lib/$_pkgname/
 	cp ${_pkgname^}/$_pkgname.png \
 		"${pkgdir}"/usr/share/pixmaps/$_pkgname.png
 	cp ${_pkgname^}/$_pkgname.desktop \
 		"${pkgdir}"/usr/share/applications/$_pkgname.desktop
 
 	# overwrite Discord asar
-	install -Dm 644 openasar/app.asar "${pkgdir}"/usr/lib/$_pkgname/
+	install -Dm 644 openasar/app.asar "${pkgdir}"/usr/lib/$_pkgname/resources/
 
 	# install the launch script
 	install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname
diff --git a/discord-electron-openasar/discord-launcher.sh b/discord-electron-openasar/discord-launcher.sh
index 55ff2a0..c63b91c 100644
--- a/discord-electron-openasar/discord-launcher.sh
+++ b/discord-electron-openasar/discord-launcher.sh
@@ -37,6 +37,6 @@ unset flags_file krisp_bin krisp_b2
 
 
 exec /usr/lib/@ELECTRON@/electron \
-	/usr/lib/@PKGNAME@/app.asar \
+	/usr/lib/@PKGNAME@/resources/app.asar \
 	--ozone-platform-hint=auto \
 	"${flags[@]}" "$@"

From 7080b90ae13e0bb6a399632a52ce95c660ed0ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Tue, 9 Apr 2024 20:16:20 +0200
Subject: [PATCH 3/4] upgpkg: discord-electron 0.0.49-1

upstream release
---
 discord-electron/.SRCINFO | 8 ++++----
 discord-electron/PKGBUILD | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO
index 359e633..04ac3f1 100644
--- a/discord-electron/.SRCINFO
+++ b/discord-electron/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron
 	pkgdesc = Discord using system provided electron (v29) for increased security and performance
-	pkgver = 0.0.48
-	pkgrel = 2
+	pkgver = 0.0.49
+	pkgrel = 1
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
@@ -18,9 +18,9 @@ pkgbase = discord-electron
 	provides = discord
 	conflicts = discord
 	options = !strip
-	source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz
+	source = https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.tar.gz
 	source = discord-launcher.sh
-	sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b
+	sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce
 	sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40
 
 pkgname = discord-electron
diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD
index acfbd3b..49a8b40 100644
--- a/discord-electron/PKGBUILD
+++ b/discord-electron/PKGBUILD
@@ -13,8 +13,8 @@
 
 pkgname=discord-electron
 _pkgname=discord
-pkgver=0.0.48
-pkgrel=2
+pkgver=0.0.49
+pkgrel=1
 _electronver=29
 _electronname="electron${_electronver}"
 pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
@@ -35,10 +35,10 @@ optdepends=(
 )
 source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
 	'discord-launcher.sh')
-sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b'
+sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce'
             '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40')
 
-_krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162'
+_krisp_b2sum='f0452620769e3a53c25b4cea257fb1a3d7be4740e77d583b6998f162dae1db1c63eabd7989adecb5b423421a6373b0ef164e23a7cff0edd8a5df3108bce938f4'
 
 prepare() {
 	# prepare launcher script

From 3f2c2f1494a40b5b22a538417a344559de54c9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Tue, 9 Apr 2024 20:16:29 +0200
Subject: [PATCH 4/4] upgpkg: discord-electron-openasar 0.0.49+827-1

upstream release
---
 discord-electron-openasar/.SRCINFO | 8 ++++----
 discord-electron-openasar/PKGBUILD | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/discord-electron-openasar/.SRCINFO b/discord-electron-openasar/.SRCINFO
index 19ae440..8742a3b 100644
--- a/discord-electron-openasar/.SRCINFO
+++ b/discord-electron-openasar/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron-openasar
 	pkgdesc = Discord packaged with OpenAsar using system provided electron (v29) for increased security and performance
-	pkgver = 0.0.48+827
-	pkgrel = 2
+	pkgver = 0.0.49+827
+	pkgrel = 1
 	url = https://discord.com
 	install = discord-electron-openasar.install
 	arch = x86_64
@@ -21,10 +21,10 @@ pkgbase = discord-electron-openasar
 	provides = discord
 	conflicts = discord
 	options = !strip
-	source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz
+	source = https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.tar.gz
 	source = discord-launcher.sh
 	source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d
-	sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b
+	sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce
 	sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40
 	sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849
 
diff --git a/discord-electron-openasar/PKGBUILD b/discord-electron-openasar/PKGBUILD
index f4ce55c..d197eb1 100644
--- a/discord-electron-openasar/PKGBUILD
+++ b/discord-electron-openasar/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=discord-electron-openasar
 _pkgname=discord
-pkgver=0.0.48+827
+pkgver=0.0.49+827
 _pkgver=${pkgver%%+*}
-pkgrel=2
+pkgrel=1
 _electronver=29
 _electronname="electron${_electronver}"
 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
@@ -30,11 +30,11 @@ optdepends=(
 source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.tar.gz"
 	'discord-launcher.sh'
 	"git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d")
-sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b'
+sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce'
             '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40'
             '055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849')
 
-_krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162'
+_krisp_b2sum='f0452620769e3a53c25b4cea257fb1a3d7be4740e77d583b6998f162dae1db1c63eabd7989adecb5b423421a6373b0ef164e23a7cff0edd8a5df3108bce938f4'
 
 # just in case I get the version wrong
 pkgver() {