Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14

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

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

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

https://github.com/daerich/void-packages multimc6-14
https://github.com/void-linux/void-packages/pull/34495

MultiMC: update to 0.6.14
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
Unfortunately upstream changed quite some things on how to reliably acquire this package - partly due to new licensing terms.
Also the way has been paved for installscripts geared towards "popular" distributions(Ubuntu/Fedora). They now only deploy a downloader to embed the package in the users home directory.
So meld the generic Linux binary with the Ubuntu one recreating the prior Void distribution of this package(Icons and .desktop are part of the Ubuntu package and can't be hosted elsewhere).
This all is necessary due to a certain company from Redmond, WA forcing Minecraft onto their infrastructure.

[ci skip]
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-multimc6-14-34495.patch --]
[-- Type: text/x-diff, Size: 4154 bytes --]

From 52c0d43542d46808e55538412340cc73da59037d Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 12 Dec 2021 14:34:53 +0100
Subject: [PATCH] MultiMC: update to 0.6.14

---
 srcpkgs/MultiMC/template | 62 +++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index a842a76ac798..6b0cac6b6747 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,50 +1,46 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.13
+version=0.6.14
 revision=1
-wrksrc="Launcher-${version}"
-_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.6.1"
-_quazipversion="multimc-3"
-build_style=cmake
-configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
-hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
-makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
+wrksrc="MultiMC"
+create_wrksrc=yes
+archs="x86_64 i686"
+_debver=1.6-1
 depends="virtual?java-environment qt5-svg"
 short_desc="Instanced Minecraft client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://multimc.org"
-distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
- https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
- https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
- 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
- ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
-skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
+distfiles="https://files.multimc.org/downloads/mmc-stable-lin64.tar.gz
+https://files.multimc.org/downloads/multimc_${_debver}.deb"
+checksum="b99051b70903c7229877c9c2bc2ccaf1c20bb2510a5e4082d0113331bd321023
+d30b2577463178fd3cbe0dd30e68a30be3f85d8f50f8052e844a43acf4b46e0f"
+nopie=yes
+nodebug=yes
 
 # Restricted since we don't have permissions to ship builds with the
 # MultiMC name, artwork or the API endpoints.
 restricted=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
-esac
-
-pre_configure() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-	export PATH=$PATH:$JAVA_HOME/bin
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1
+do_extract() {
+	bsdtar -xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/multimc_${_debver}.deb
+	bsdtar -xf data.tar.xz
+	bsdtar -xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/mmc-stable-lin64.tar.gz
 }
 
-post_install() {
+do_install() {
 	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
-	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
-	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
+	vmkdir usr/bin
+	vmkdir usr/share/applications
+	vmkdir usr/share/pixmaps
+	vbin ${FILESDIR}/MultiMC.sh MultiMC
+	cp -R ./MultiMC/bin/* ${DESTDIR}/usr/libexec/multimc
+	chmod 755 ${DESTDIR}/usr/libexec/multimc/*.so
+	mv ${DESTDIR}/usr/libexec/multimc/MultiMC ${DESTDIR}/usr/libexec/multimc/multimc
+	mv opt/multimc/icon.svg ${DESTDIR}/usr/share/pixmaps/multimc.svg
+	mv usr/share/applications/multimc.desktop ${DESTDIR}/usr/share/applications/
+	chmod 644 ${DESTDIR}/usr/share/applications/multimc.desktop
+	vsed -i ${DESTDIR}/usr/share/applications/multimc.desktop -e 's%Exec=/opt/multimc/run.sh%Exec=MultiMC%'
+	vsed -i ${DESTDIR}/usr/share/applications/multimc.desktop -e 's%Icon=/opt/multimc/icon.svg%Icon=multimc%'
+	chmod 644 ${DESTDIR}/usr/share/pixmaps/multimc.svg
 }