From da22f4df2eb8390e2482c8b49a98e9ec11846a20 Mon Sep 17 00:00:00 2001
From: Zoh-j02r <saulobruno@usp.br>
Date: Sat, 31 Dec 2022 15:10:30 -0300
Subject: [PATCH 1/2] New package: armcord-3.1.4

---
 srcpkgs/armcord/files/armcord.desktop |  8 ++++++
 srcpkgs/armcord/template              | 38 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/armcord/files/armcord.desktop
 create mode 100644 srcpkgs/armcord/template

diff --git a/srcpkgs/armcord/files/armcord.desktop b/srcpkgs/armcord/files/armcord.desktop
new file mode 100644
index 000000000000..c60304830d2a
--- /dev/null
+++ b/srcpkgs/armcord/files/armcord.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ArmCord
+Comment=Custom client designed to enhance Discord experience"
+Exec=/usr/bin/armcord
+Icon=armcord
+Terminal=false
+Type=Application
+Categories=Network;Chat;
diff --git a/srcpkgs/armcord/template b/srcpkgs/armcord/template
new file mode 100644
index 000000000000..b765c7275f13
--- /dev/null
+++ b/srcpkgs/armcord/template
@@ -0,0 +1,38 @@
+# Template file for 'armcord'
+pkgname=armcord
+version=3.1.4
+revision=1
+archs="x86_64* i686* aarch64* armv7l*"
+hostmakedepends="nodejs"
+depends="alsa-lib dbus-glib libnotify atk gtk+3 nss xdg-utils webrtc-audio-processing"
+short_desc="A custom client designed to enhance your Discord experience"
+maintainer="Zoh-j02r <saulobruno@usp.br>"
+license="custom:OSL-3.0"
+homepage="https://github.com/ArmCord/ArmCord"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum="4b40b58a73b0c81b0fa75e40ae0167ee5d7f35fc09b94e4a993bc09cd2e41974"
+
+do_build() {
+	npx --yes pnpm install --frozen-lockfile --ignore-scripts
+	npm run packageQuick
+}
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir ${package_location}
+	vinstall build/icon.png 644 /usr/share/pixmaps/ armcord.png
+	cd dist/linux-unpacked/
+	for item in locales resources armcord libffmpeg.so snapshot_blob.bin icudtl.dat\
+	libEGL.so libGLESv2.so libvulkan.so.1 chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak vk_swiftshader_icd.json v8_context_snapshot.bin \
+	chrome_crashpad_handler libvk_swiftshader.so; do
+		vcopy "${item}" "${package_location}"
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/$package_location/armcord $DESTDIR/usr/bin/armcord
+	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
+	done;
+}
+
+post_install() {
+	vlicense LICENSE
+}

From e13a51b33ce89d96e9977ead3225c5794f6e367b Mon Sep 17 00:00:00 2001
From: Zoh-j02r <saulobruno@usp.br>
Date: Tue, 3 Jan 2023 15:32:19 -0300
Subject: [PATCH 2/2] New package: armcord-1.3.4

---
 srcpkgs/armcord/files/armcord.desktop |  2 +-
 srcpkgs/armcord/template              | 36 +++++++++++++++++++--------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/armcord/files/armcord.desktop b/srcpkgs/armcord/files/armcord.desktop
index c60304830d2a..1ad3fcabd86f 100644
--- a/srcpkgs/armcord/files/armcord.desktop
+++ b/srcpkgs/armcord/files/armcord.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=ArmCord
-Comment=Custom client designed to enhance Discord experience"
+Comment=Custom client designed to enhance your Discord experience
 Exec=/usr/bin/armcord
 Icon=armcord
 Terminal=false
diff --git a/srcpkgs/armcord/template b/srcpkgs/armcord/template
index b765c7275f13..99027d5e42c4 100644
--- a/srcpkgs/armcord/template
+++ b/srcpkgs/armcord/template
@@ -1,36 +1,52 @@
+
 # Template file for 'armcord'
 pkgname=armcord
 version=3.1.4
 revision=1
 archs="x86_64* i686* aarch64* armv7l*"
-hostmakedepends="nodejs"
+hostmakedepends="nodejs electron19 git"
 depends="alsa-lib dbus-glib libnotify atk gtk+3 nss xdg-utils webrtc-audio-processing"
-short_desc="A custom client designed to enhance your Discord experience"
+short_desc="Custom client designed to enhance Discord experience"
 maintainer="Zoh-j02r <saulobruno@usp.br>"
 license="custom:OSL-3.0"
 homepage="https://github.com/ArmCord/ArmCord"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
 checksum="4b40b58a73b0c81b0fa75e40ae0167ee5d7f35fc09b94e4a993bc09cd2e41974"
+nopie=yes
+
+do_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i 's|--dir|--dir --'"$(_get_arch)"'|'  package.json
+	else
+		vsed -e 's|--dir|--dir -c.electronDist=/usr/lib/electron19/ -c.electronVersion=electron|' \
+		-i package.json
+	fi
+}
 
 do_build() {
+	npm_config_arch=$(_get_arch) 
 	npx --yes pnpm install --frozen-lockfile --ignore-scripts
 	npm run packageQuick
 }
 
+_get_arch() {
+	case "${XBPS_TARGET_MACHINE}" in
+		x86_64*) echo x64 ;;
+		i686*) echo ia32 ;;
+		aarch64*) echo arm64 ;;
+		armv7l*) echo armv7l ;;
+		*) msg_error "${XBPS_TARGET_MACHINE} architecture not supported.\n" ;;
+	esac
+}
+
 do_install() {
 	local package_location="usr/lib/$pkgname" item
 	vmkdir ${package_location}
 	vinstall build/icon.png 644 /usr/share/pixmaps/ armcord.png
-	cd dist/linux-unpacked/
-	for item in locales resources armcord libffmpeg.so snapshot_blob.bin icudtl.dat\
-	libEGL.so libGLESv2.so libvulkan.so.1 chrome_100_percent.pak chrome_200_percent.pak \
-	chrome-sandbox resources.pak vk_swiftshader_icd.json v8_context_snapshot.bin \
-	chrome_crashpad_handler libvk_swiftshader.so; do
-		vcopy "${item}" "${package_location}"
+	vcopy dist/*-unpacked/* $package_location
 	vmkdir usr/bin
-	ln -sfr $DESTDIR/$package_location/armcord $DESTDIR/usr/bin/armcord
+	ln -sfr $DESTDIR/$package_location/$pkgname $DESTDIR/usr/bin/armcord
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
-	done;
 }
 
 post_install() {