Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] MultiMC: remove package(was MultiMC: update to 0.6.14)
Date: Sat, 09 Apr 2022 17:55:37 +0200	[thread overview]
Message-ID: <20220409155537.kG2sWJpXGkXS82coy4vpGzSQQYIKW9zr949FUh9DNkw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34495@inbox.vuxu.org>

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

  parent reply	other threads:[~2022-04-09 15:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` paper42 [this message]
2022-04-09 16:06 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220409155537.kG2sWJpXGkXS82coy4vpGzSQQYIKW9zr949FUh9DNkw@z \
    --to=paper42@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).