From: Zoh-j02r <Zoh-j02r@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: armcord-3.1.4
Date: Thu, 09 Mar 2023 00:22:33 +0100 [thread overview]
Message-ID: <20230308232233.P0_X4RT4dRFaahI22R0xfBfnhGmLGhU0dovGu4FAmic@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41385@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 791 bytes --]
There is an updated pull request by Zoh-j02r against master on the void-packages repository
https://github.com/Zoh-j02r/void-packages armcord-testing
https://github.com/void-linux/void-packages/pull/41385
New package: armcord-3.1.4
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686*
🤮electron
A patch file from https://github.com/void-linux/void-packages/pull/41385.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-armcord-testing-41385.patch --]
[-- Type: text/x-diff, Size: 8521 bytes --]
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/4] 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/4] 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() {
From 1f1b92ff309881aed7a03e0d8a0adb99879a71c8 Mon Sep 17 00:00:00 2001
From: Zoh-j02r <saulobruno@usp.br>
Date: Sat, 7 Jan 2023 22:10:08 -0300
Subject: [PATCH 3/4] New package: armcord-1.3.4
---
srcpkgs/armcord/template | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/armcord/template b/srcpkgs/armcord/template
index 99027d5e42c4..47dac093eed1 100644
--- a/srcpkgs/armcord/template
+++ b/srcpkgs/armcord/template
@@ -1,9 +1,8 @@
-
# Template file for 'armcord'
pkgname=armcord
version=3.1.4
revision=1
-archs="x86_64* i686* aarch64* armv7l*"
+archs="x86_64* i686*"
hostmakedepends="nodejs electron19 git"
depends="alsa-lib dbus-glib libnotify atk gtk+3 nss xdg-utils webrtc-audio-processing"
short_desc="Custom client designed to enhance Discord experience"
@@ -14,31 +13,23 @@ distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
checksum="4b40b58a73b0c81b0fa75e40ae0167ee5d7f35fc09b94e4a993bc09cd2e41974"
nopie=yes
+_get_arch() {
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) echo x64 ;;
+ i686*) echo ia32 ;;
+ esac
+}
+
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
+ vsed -e 's|--dir|--dir --'"$(_get_arch)"' -c.electronDist=/usr/lib/electron19/ -c.electronVersion=electron|' \
+ -i package.json
}
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}
@@ -46,6 +37,7 @@ do_install() {
vcopy dist/*-unpacked/* $package_location
vmkdir usr/bin
ln -sfr $DESTDIR/$package_location/$pkgname $DESTDIR/usr/bin/armcord
+ chmod u+s $DESTDIR/usr/lib/$pkgname/chrome-sandbox
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
}
From 13cbd0cb59a475f8f6d55d18c39fe3c19a9c69a3 Mon Sep 17 00:00:00 2001
From: Zoh-j02r <saulobruno@usp.br>
Date: Sat, 7 Jan 2023 22:12:17 -0300
Subject: [PATCH 4/4] New package: armcord-1.3.4
---
srcpkgs/armcord/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/armcord/template b/srcpkgs/armcord/template
index 47dac093eed1..37922d69f741 100644
--- a/srcpkgs/armcord/template
+++ b/srcpkgs/armcord/template
@@ -37,7 +37,6 @@ do_install() {
vcopy dist/*-unpacked/* $package_location
vmkdir usr/bin
ln -sfr $DESTDIR/$package_location/$pkgname $DESTDIR/usr/bin/armcord
- chmod u+s $DESTDIR/usr/lib/$pkgname/chrome-sandbox
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
}
next prev parent reply other threads:[~2023-03-08 23:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-31 18:21 [PR PATCH] " Zoh-j02r
2022-12-31 20:13 ` Duncaen
2022-12-31 20:55 ` paper42
2023-01-01 15:55 ` [PR PATCH] [Updated] " Zoh-j02r
2023-01-01 16:07 ` Zoh-j02r
2023-01-01 16:23 ` Zoh-j02r
2023-01-01 18:59 ` [PR REVIEW] " Vendicated
2023-01-01 19:03 ` Vendicated
2023-01-03 1:06 ` [PR PATCH] [Updated] " Zoh-j02r
2023-01-03 1:08 ` Zoh-j02r
2023-01-03 1:13 ` Zoh-j02r
2023-01-03 1:14 ` Zoh-j02r
2023-01-03 18:21 ` Zoh-j02r
2023-01-03 18:27 ` [PR PATCH] [Updated] " Zoh-j02r
2023-01-03 18:28 ` Zoh-j02r
2023-01-03 18:32 ` Zoh-j02r
2023-01-07 17:40 ` yurifuko
2023-01-08 0:49 ` [PR PATCH] [Updated] " Zoh-j02r
2023-01-08 1:10 ` Zoh-j02r
2023-01-08 1:12 ` Zoh-j02r
2023-01-08 9:46 ` paper42
2023-01-08 9:46 ` [PR REVIEW] " paper42
2023-01-08 13:49 ` Zoh-j02r
2023-03-08 23:22 ` Zoh-j02r [this message]
2023-03-20 7:54 ` paper42
2023-03-20 11:13 ` Zoh-j02r
2023-03-22 23:42 ` paper42
2023-03-22 23:42 ` [PR PATCH] [Closed]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230308232233.P0_X4RT4dRFaahI22R0xfBfnhGmLGhU0dovGu4FAmic@z \
--to=zoh-j02r@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).