Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] MultiMC: update to 0.6.14
@ 2021-12-12 15:45 daerich
  2021-12-12 15:52 ` [PR PATCH] [Updated] " daerich
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: daerich @ 2021-12-12 15:45 UTC (permalink / raw)
  To: ml

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

There is a new 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 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.
<!--
#### 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: 4134 bytes --]

From 93eef859d9f41110253aed8f8a481f8baddc6377 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 | 57 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index a842a76ac798..58d79d2a16fc 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,27 +1,21 @@
 # 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
+_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.
@@ -31,20 +25,25 @@ 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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
@ 2021-12-12 15:52 ` daerich
  2021-12-12 15:53 ` daerich
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 15:52 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
  2021-12-12 15:52 ` [PR PATCH] [Updated] " daerich
@ 2021-12-12 15:53 ` daerich
  2021-12-12 15:57 ` daerich
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 15:53 UTC (permalink / raw)
  To: ml

[-- 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 542c1c1e4d09dc4a06d156540235f4a8a48af9cb 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..6ebac4b8aa03 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"
+archs="x86_64 i686"
+wrksrc="MultiMC"
+create_wrksrc=yes
+_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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
  2021-12-12 15:52 ` [PR PATCH] [Updated] " daerich
  2021-12-12 15:53 ` daerich
@ 2021-12-12 15:57 ` daerich
  2021-12-12 16:06 ` daerich
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 15:57 UTC (permalink / raw)
  To: ml

[-- 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: 4248 bytes --]

From d5db2d6b7e1946d6166133d2dd973035ca2e8141 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 | 68 +++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index a842a76ac798..b0a4afd03734 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,50 +1,52 @@
 # 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"
+archs="x86_64 i686"
+wrksrc="MultiMC"
+create_wrksrc=yes
 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"
+
+case $XBPS_TARGET_MACHINE" in
+	i686)_arch="32";;
+	x86_64_arch="64";;
+esac
+_debver=1.6-1
+
+distfiles="https://files.multimc.org/downloads/mmc-stable-lin${_arch}.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-lin${_arch}.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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (2 preceding siblings ...)
  2021-12-12 15:57 ` daerich
@ 2021-12-12 16:06 ` daerich
  2021-12-12 16:07 ` daerich
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 16:06 UTC (permalink / raw)
  To: ml

[-- 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: 4408 bytes --]

From 717df9b25ef5928ac3efc4d07d1cbd916d7e6171 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 | 70 +++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index a842a76ac798..b3c2b42a0da1 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,50 +1,54 @@
 # 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"
+archs="x86_64 i686"
+wrksrc="MultiMC"
+create_wrksrc=yes
 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"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686)_arch="32"
+	checksum="5ea54392e35e97f7123ddf669ebd02271474a758a75f4fecc0acd4f6eb240829 ";;
+	x86_64)_arch="64"
+	checksum="b99051b70903c7229877c9c2bc2ccaf1c20bb2510a5e4082d0113331bd321023 ";;
+	*)broken="aarch* and arm* binaries are not shipped by upstream!"
+esac
+_debver=1.6-1
+
+distfiles="https://files.multimc.org/downloads/mmc-stable-lin${_arch}.tar.gz
+https://files.multimc.org/downloads/multimc_${_debver}.deb"
+checksum+=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-lin${_arch}.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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (3 preceding siblings ...)
  2021-12-12 16:06 ` daerich
@ 2021-12-12 16:07 ` daerich
  2021-12-12 16:57 ` Duncaen
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 16:07 UTC (permalink / raw)
  To: ml

[-- 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: 4410 bytes --]

From 5843e42c1c81af05ecb4b87f14d5e403c787105f 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 | 70 +++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index a842a76ac798..fcdaa26dfcf1 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,50 +1,54 @@
 # 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"
+archs="x86_64 i686"
+wrksrc="MultiMC"
+create_wrksrc=yes
 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"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686)_arch="32"
+	checksum="5ea54392e35e97f7123ddf669ebd02271474a758a75f4fecc0acd4f6eb240829 ";;
+	x86_64)_arch="64"
+	checksum="b99051b70903c7229877c9c2bc2ccaf1c20bb2510a5e4082d0113331bd321023 ";;
+	*)broken="aarch* and arm* binaries are not shipped by upstream!";;
+esac
+_debver=1.6-1
+
+distfiles="https://files.multimc.org/downloads/mmc-stable-lin${_arch}.tar.gz
+https://files.multimc.org/downloads/multimc_${_debver}.deb"
+checksum+=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-lin${_arch}.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
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: update to 0.6.14
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (4 preceding siblings ...)
  2021-12-12 16:07 ` daerich
@ 2021-12-12 16:57 ` Duncaen
  2021-12-12 17:51 ` MultiMC: remove package(was MultiMC: update to 0.6.14) daerich
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Duncaen @ 2021-12-12 16:57 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-991932811

Comment:
If we can't build it from source then we don't ship it, this is already restricted because of the permissions issue. The value in building it from source is that someone can do it themselves and use it on not supported architectures/libcs.
If you are using the binaries, just use them directly.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (5 preceding siblings ...)
  2021-12-12 16:57 ` Duncaen
@ 2021-12-12 17:51 ` daerich
  2021-12-12 17:51 ` daerich
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 17:51 UTC (permalink / raw)
  To: ml

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

New comment by daerich on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-991941541

Comment:
Well then it would be appropriate to remove that package as it has no value being outdated with limited support for the current login infrastructure(only deprecated method fully supported). The only question remaining would be to add it to removed-packages this time...

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (6 preceding siblings ...)
  2021-12-12 17:51 ` MultiMC: remove package(was MultiMC: update to 0.6.14) daerich
@ 2021-12-12 17:51 ` daerich
  2021-12-12 17:53 ` [PR PATCH] [Updated] " daerich
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 17:51 UTC (permalink / raw)
  To: ml

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

New comment by daerich on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-991941541

Comment:
Well then it would be appropriate to remove that package as it has no value being outdated with limited support for the current login infrastructure(only deprecated method fully supported). The only question remaining would if ti should be added  to removed-packages this time...

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (7 preceding siblings ...)
  2021-12-12 17:51 ` daerich
@ 2021-12-12 17:53 ` daerich
  2021-12-12 17:55 ` daerich
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 17:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1863 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: remove package(was 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.

<!--
#### 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: 3162 bytes --]

From cbd9c24bf133428ca90dc8180a1173c23fb9eb87 Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 12 Dec 2021 18:53:20 +0100
Subject: [PATCH] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh |  2 --
 srcpkgs/MultiMC/template         | 50 --------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-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"
-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"
-
-# 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
-}
-
-post_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
-}

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (8 preceding siblings ...)
  2021-12-12 17:53 ` [PR PATCH] [Updated] " daerich
@ 2021-12-12 17:55 ` daerich
  2021-12-19 17:43 ` [PR PATCH] [Updated] " daerich
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-12 17:55 UTC (permalink / raw)
  To: ml

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

New comment by daerich on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-991941541

Comment:
Well then it would be appropriate to remove that package as it has no value lingering in the collection being outdated with limited support for the current login infrastructure(only deprecated method fully supported). The only question remaining would if it should be added  to removed-packages this time...

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (9 preceding siblings ...)
  2021-12-12 17:55 ` daerich
@ 2021-12-19 17:43 ` daerich
  2021-12-19 17:51 ` daerich
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-19 17:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1965 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: remove package(was 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.
__Edit__: It can not be reliably built from source anymore as it is missing the `secrets` library.
~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.~

<!--
#### 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: 3168 bytes --]

From 7d2a881a80faf386b036f9dd8cc665fb72bd4e86 Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh |  2 --
 srcpkgs/MultiMC/template         | 50 --------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-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"
-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"
-
-# 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
-}
-
-post_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
-}

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (10 preceding siblings ...)
  2021-12-19 17:43 ` [PR PATCH] [Updated] " daerich
@ 2021-12-19 17:51 ` daerich
  2022-02-10 14:36 ` daerich
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2021-12-19 17:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1965 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: remove package(was 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.
__Edit__: It can not be reliably built from source anymore as it is missing the `secrets` library.
~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.~

<!--
#### 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: 3168 bytes --]

From dd0eb4aab701b64c280d01e02947847cde1b05e7 Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh |  2 --
 srcpkgs/MultiMC/template         | 50 --------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-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"
-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"
-
-# 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
-}
-
-post_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
-}

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (11 preceding siblings ...)
  2021-12-19 17:51 ` daerich
@ 2022-02-10 14:36 ` daerich
  2022-04-09 11:30 ` tibequadorian
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2022-02-10 14:36 UTC (permalink / raw)
  To: ml

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

New comment by daerich on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-1034995228

Comment:
@Duncaen  Friendly ping in light of #34979 :)
I'd be happy to close this if this a nonissue...

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (12 preceding siblings ...)
  2022-02-10 14:36 ` daerich
@ 2022-04-09 11:30 ` tibequadorian
  2022-04-09 15:03 ` [PR PATCH] [Closed]: " daerich
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tibequadorian @ 2022-04-09 11:30 UTC (permalink / raw)
  To: ml

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

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-1093939838

Comment:
#34979 was merged

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Closed]: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (13 preceding siblings ...)
  2022-04-09 11:30 ` tibequadorian
@ 2022-04-09 15:03 ` daerich
  2022-04-09 15:46 ` tibequadorian
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: daerich @ 2022-04-09 15:03 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

MultiMC: remove package(was MultiMC: update to 0.6.14)
https://github.com/void-linux/void-packages/pull/34495

Description:
<!-- 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.
__Edit__: It can not be reliably built from source anymore as it is missing the `secrets` library.
~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.~

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


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (14 preceding siblings ...)
  2022-04-09 15:03 ` [PR PATCH] [Closed]: " daerich
@ 2022-04-09 15:46 ` tibequadorian
  2022-04-09 15:55 ` [PR PATCH] [Updated] " paper42
  2022-04-09 16:06 ` [PR PATCH] [Merged]: " paper42
  17 siblings, 0 replies; 19+ messages in thread
From: tibequadorian @ 2022-04-09 15:46 UTC (permalink / raw)
  To: ml

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

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/34495#issuecomment-1094071627

Comment:
Why did you close this PR? It was meant as a reminder to merge this.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (15 preceding siblings ...)
  2022-04-09 15:46 ` tibequadorian
@ 2022-04-09 15:55 ` paper42
  2022-04-09 16:06 ` [PR PATCH] [Merged]: " paper42
  17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-04-09 15:55 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by paper42 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: remove package(was 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.
__Edit__: It can not be reliably built from source anymore as it is missing the `secrets` library.
~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.~

<!--
#### 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: 3636 bytes --]

From 8a01155e1475d8015e20c804cde92aae9d6339ca Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh  |  2 --
 srcpkgs/MultiMC/template          | 50 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-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"
-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"
-
-# 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
-}
-
-post_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
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d6d2c153348..6859fe29da93 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
+ MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Merged]: MultiMC: remove package(was MultiMC: update to 0.6.14)
  2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
                   ` (16 preceding siblings ...)
  2022-04-09 15:55 ` [PR PATCH] [Updated] " paper42
@ 2022-04-09 16:06 ` paper42
  17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-04-09 16:06 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

MultiMC: remove package(was MultiMC: update to 0.6.14)
https://github.com/void-linux/void-packages/pull/34495

Description:
<!-- 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.
__Edit__: It can not be reliably built from source anymore as it is missing the `secrets` library.
~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.~

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


^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2022-04-09 16:06 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-12 15:45 [PR PATCH] MultiMC: update to 0.6.14 daerich
2021-12-12 15:52 ` [PR PATCH] [Updated] " daerich
2021-12-12 15:53 ` daerich
2021-12-12 15:57 ` daerich
2021-12-12 16:06 ` daerich
2021-12-12 16:07 ` daerich
2021-12-12 16:57 ` Duncaen
2021-12-12 17:51 ` MultiMC: remove package(was MultiMC: update to 0.6.14) daerich
2021-12-12 17:51 ` daerich
2021-12-12 17:53 ` [PR PATCH] [Updated] " daerich
2021-12-12 17:55 ` daerich
2021-12-19 17:43 ` [PR PATCH] [Updated] " daerich
2021-12-19 17:51 ` daerich
2022-02-10 14:36 ` daerich
2022-04-09 11:30 ` tibequadorian
2022-04-09 15:03 ` [PR PATCH] [Closed]: " daerich
2022-04-09 15:46 ` tibequadorian
2022-04-09 15:55 ` [PR PATCH] [Updated] " paper42
2022-04-09 16:06 ` [PR PATCH] [Merged]: " paper42

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).