From da22f4df2eb8390e2482c8b49a98e9ec11846a20 Mon Sep 17 00:00:00 2001 From: Zoh-j02r Date: Sat, 31 Dec 2022 15:10:30 -0300 Subject: [PATCH 1/5] 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 " +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 b951ea95c2764807d93fb56416193541208e200a Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 29 Dec 2022 14:17:04 +0100 Subject: [PATCH 2/5] fbpdf: update to 20220624 --- srcpkgs/fbpdf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template index c77a1e923408..3c89ffca42fe 100644 --- a/srcpkgs/fbpdf/template +++ b/srcpkgs/fbpdf/template @@ -1,8 +1,8 @@ # Template file for 'fbpdf' pkgname=fbpdf -version=0.0.20200616 -revision=4 -_githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e +version=0.0.20220624 +revision=1 +_githash=6276360f47edd71de736e153f5dcc82b6d60b3db _gitshort="${_githash:0:7}" build_style=gnu-makefile makedepends="djvulibre-devel freetype-devel harfbuzz-devel @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="ISC" homepage="https://repo.or.cz/w/fbpdf.git" distfiles="https://repo.or.cz/fbpdf.git/snapshot/${_githash}.tar.gz" -checksum=a86483a3ec144b68b89641abccb848b390ad901732c5e6043e3eb67e0ede7986 +checksum=7e0a95465c051fdbec56982efabe20b73745b12e60a2b23277afde8e4b16ec5e pre_build() { # Can't do it via LDFLAGS, that messes up the linking order From 42c70eaa172ed41fdbf61b76b940344affc13659 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 31 Dec 2022 20:35:50 +0100 Subject: [PATCH 3/5] vaultwarden: disable on i686 for now fails to build with: thread 'main' panicked at 'called `Option::unwrap()` on a `None` value', cargo-auditable/src/rustc_wrapper.rs:91:39 --- srcpkgs/vaultwarden/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template index 0d195c770405..764c17e99143 100644 --- a/srcpkgs/vaultwarden/template +++ b/srcpkgs/vaultwarden/template @@ -2,7 +2,7 @@ pkgname=vaultwarden version=1.27.0 revision=1 -archs="x86_64* i686* aarch64* arm*" # ring +archs="x86_64* aarch64* arm*" # ring build_style=cargo configure_args="--features sqlite,mysql,postgresql" hostmakedepends="pkg-config" From 369fa0e0d39f98e053a04362bd743912b9383333 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sat, 31 Dec 2022 20:49:37 -0500 Subject: [PATCH 4/5] d2: update to 0.1.4. --- srcpkgs/d2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template index 6ac473a86a13..c63a3e84a350 100644 --- a/srcpkgs/d2/template +++ b/srcpkgs/d2/template @@ -1,6 +1,6 @@ # Template file for 'd2' pkgname=d2 -version=0.1.3 +version=0.1.4 revision=1 build_style=go go_import_path="oss.terrastruct.com/d2" @@ -10,4 +10,4 @@ maintainer="Toyam Cox " license="MPL-2.0" homepage="https://d2lang.com/" distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz" -checksum=9dc8c88d07725d549b8a20ae3271e82b01c0c45b0c7338a1ec67aad0c4facc54 +checksum=ce658b1ed243b2712a7544f109f08dbc6f9690d1f6443a3fa6b39d0f6ccd626a From e5d4aca24d9ac00244850be0323c508d61f33238 Mon Sep 17 00:00:00 2001 From: Zoh-j02r Date: Sun, 1 Jan 2023 12:55:12 -0300 Subject: [PATCH 5/5] New package: armcord 1.3.4 --- srcpkgs/armcord/template | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/srcpkgs/armcord/template b/srcpkgs/armcord/template index b765c7275f13..bdcfa7d9d4cd 100644 --- a/srcpkgs/armcord/template +++ b/srcpkgs/armcord/template @@ -1,36 +1,53 @@ + # 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 " 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 -i 's,--dir,--dir \ + -c.electronDist=/usr/lib/electron19/ \ + -c.electronVersion=electron,' 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() {