Re: [PR PATCH] [Updated] New package: heroic-games-launcher-2.4.3

[wiktorciurej <wiktorciurej@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]

There is an updated pull request by wiktorciurej against master on the void-packages repository

https://github.com/wiktorciurej/void-packages new_package/heroic-games-launcher
https://github.com/void-linux/void-packages/pull/40220

New package: heroic-games-launcher-2.4.3
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### 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):
  - aarch64*
  - armv7l*
  - x86_64-musl



A patch file from https://github.com/void-linux/void-packages/pull/40220.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new_package/heroic-games-launcher-40220.patch --]
[-- Type: text/x-diff, Size: 7534 bytes --]

From e383def50503a73f9736553f025888edbca8f586 Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sat, 29 Oct 2022 18:47:44 +0200
Subject: [PATCH 1/4] New package: heroic-games-launcher-2.4.3

---
 .../files/heroic.desktop                      | 10 +++++
 srcpkgs/heroic-games-launcher/template        | 45 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/heroic-games-launcher/files/heroic.desktop
 create mode 100644 srcpkgs/heroic-games-launcher/template

diff --git a/srcpkgs/heroic-games-launcher/files/heroic.desktop b/srcpkgs/heroic-games-launcher/files/heroic.desktop
new file mode 100644
index 000000000000..15c393b9e41e
--- /dev/null
+++ b/srcpkgs/heroic-games-launcher/files/heroic.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Heroic Games Launcher
+Exec=/usr/bin/heroic %U
+Terminal=false
+Type=Application
+Icon=heroic
+StartupWMClass=Heroic
+Comment=Open Source GOG and Epic Games launcher
+MimeType=x-scheme-handler/heroic;
+Categories=Game;
diff --git a/srcpkgs/heroic-games-launcher/template b/srcpkgs/heroic-games-launcher/template
new file mode 100644
index 000000000000..aeddb6f659b8
--- /dev/null
+++ b/srcpkgs/heroic-games-launcher/template
@@ -0,0 +1,45 @@
+# Template file for 'heroic-games-launcher'
+pkgname=heroic-games-launcher
+version=2.4.3
+revision=1
+archs="x86_64* armv7l* aarch64*"
+wrksrc="HeroicGamesLauncher-${version}"
+hostmakedepends="nodejs python3 yarn"
+depends="alsa-lib gtk+3 nss python3"
+checkdepends="tar xz"
+short_desc="Open Source Launcher for GOG and Epic Games"
+maintainer="Wiktor Ciurej <wiktor.ciurej@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"
+distfiles="https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/archive/v${version}.tar.gz"
+checksum=b6590fd99776c2f6d890266ee177d1d90f8a127eaa47b9aec41fc00c4194bc9a
+nopie_files="/opt/heroic/resources/app.asar.unpacked/build/bin/linux/gogdl
+	/opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary"
+
+case ${XBPS_TARGET_MACHINE} in
+	x86_64*) _arch=x64 ;;
+	aarch64*) _arch=arm64 ;;
+	armv7l*) _arch=armv7l ;;
+	*) broken="There is no electron package provided for selected architecture." ;;
+esac
+
+do_build() {
+	npm_config_arch=${_arch} npm_config_platform=linux yarn
+	npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
+}
+
+do_check() {
+	npm_config_arch=${_arch} yarn test
+	npm_config_arch=${_arch} yarn test:ci
+}
+
+do_install() {
+	vmkdir opt/heroic/
+	vcopy dist/linux-unpacked/* opt/heroic/
+	vmkdir usr/bin/
+	ln -sf /opt/heroic/heroic ${DESTDIR}/usr/bin/heroic
+	vmkdir usr/share/pixmaps/
+	vinstall public/icon.png 0755 usr/share/pixmaps/ heroic.png
+	vmkdir usr/share/applications/
+	vinstall ${FILESDIR}/heroic.desktop 0755 usr/share/applications/
+}

From 32d8dd571cb5d5999212414e3d9c8245ad65c227 Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sat, 29 Oct 2022 23:08:07 +0200
Subject: [PATCH 2/4] heroic-games-launcher: Fix arm install errors.

---
 srcpkgs/heroic-games-launcher/template | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/heroic-games-launcher/template b/srcpkgs/heroic-games-launcher/template
index aeddb6f659b8..adf58f561712 100644
--- a/srcpkgs/heroic-games-launcher/template
+++ b/srcpkgs/heroic-games-launcher/template
@@ -23,6 +23,14 @@ case ${XBPS_TARGET_MACHINE} in
 	*) broken="There is no electron package provided for selected architecture." ;;
 esac
 
+if ! [ ${_arch} == "x64" ]; then
+	nostrip_files="/opt/heroic/resources/app.asar.unpacked/build/bin/linux/gogdl
+	/opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary"
+
+	skiprdeps="/opt/heroic/resources/app.asar.unpacked/build/bin/linux/gogdl
+	/opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary"
+fi
+
 do_build() {
 	npm_config_arch=${_arch} npm_config_platform=linux yarn
 	npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
@@ -35,11 +43,15 @@ do_check() {
 
 do_install() {
 	vmkdir opt/heroic/
-	vcopy dist/linux-unpacked/* opt/heroic/
+	if [ ${_arch} == "x64" ]; then
+		vcopy dist/linux-unpacked/* opt/heroic/
+	else
+		vcopy dist/linux-${_arch}-unpacked/* opt/heroic/
+	fi
 	vmkdir usr/bin/
 	ln -sf /opt/heroic/heroic ${DESTDIR}/usr/bin/heroic
 	vmkdir usr/share/pixmaps/
 	vinstall public/icon.png 0755 usr/share/pixmaps/ heroic.png
 	vmkdir usr/share/applications/
-	vinstall ${FILESDIR}/heroic.desktop 0755 usr/share/applications/
+	vinstall ${FILESDIR}/heroic.desktop 0644 usr/share/applications/
 }

From 3cd7a8554d342e3c34a93cf28c1f017098e1d79b Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sun, 30 Oct 2022 01:23:56 +0200
Subject: [PATCH 3/4] heroic-games-launcher: Fix musl builds failing.

---
 srcpkgs/heroic-games-launcher/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/heroic-games-launcher/template b/srcpkgs/heroic-games-launcher/template
index adf58f561712..1ce15d1792f4 100644
--- a/srcpkgs/heroic-games-launcher/template
+++ b/srcpkgs/heroic-games-launcher/template
@@ -31,9 +31,16 @@ if ! [ ${_arch} == "x64" ]; then
 	/opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary"
 fi
 
+if [ ${XBPS_TARGET_LIBC} == "musl" ]; then
+	hostmakedepends+=" p7zip"
+	_use_system_p7zip=true
+else
+	_use_system_p7zip=false
+fi
+
 do_build() {
 	npm_config_arch=${_arch} npm_config_platform=linux yarn
-	npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
+	USE_SYSTEM_7ZA=${_use_system_p7zip} npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
 }
 
 do_check() {

From 444354421c8d4d8f3426e9c3cc0ad75287bed623 Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sun, 30 Oct 2022 11:32:33 +0100
Subject: [PATCH 4/4] heroic-games-launcher: Exclude musl arch because of
 bundled glibc libs.

---
 srcpkgs/heroic-games-launcher/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/heroic-games-launcher/template b/srcpkgs/heroic-games-launcher/template
index 1ce15d1792f4..e611a8064914 100644
--- a/srcpkgs/heroic-games-launcher/template
+++ b/srcpkgs/heroic-games-launcher/template
@@ -2,7 +2,7 @@
 pkgname=heroic-games-launcher
 version=2.4.3
 revision=1
-archs="x86_64* armv7l* aarch64*"
+archs="x86_64-glibc armv7l-glibc aarch64-glibc"
 wrksrc="HeroicGamesLauncher-${version}"
 hostmakedepends="nodejs python3 yarn"
 depends="alsa-lib gtk+3 nss python3"
@@ -31,16 +31,18 @@ if ! [ ${_arch} == "x64" ]; then
 	/opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary"
 fi
 
-if [ ${XBPS_TARGET_LIBC} == "musl" ]; then
-	hostmakedepends+=" p7zip"
-	_use_system_p7zip=true
-else
-	_use_system_p7zip=false
-fi
+# Bundled libs are compiled against glibc so musl build won't work anyway.
+#if [ ${XBPS_TARGET_LIBC} == "musl" ]; then
+#	hostmakedepends+=" p7zip"
+#	_use_system_p7zip=true
+#else
+#	_use_system_p7zip=false
+#fi
 
 do_build() {
 	npm_config_arch=${_arch} npm_config_platform=linux yarn
-	USE_SYSTEM_7ZA=${_use_system_p7zip} npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
+#	USE_SYSTEM_7ZA=${_use_system_p7zip} npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
+	npm_config_arch=${_arch} npm_config_platform=linux yarn dist:linux tar.xz --${_arch}
 }
 
 do_check() {