From: oynqr <oynqr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: PolyMC-1.1.0
Date: Sun, 20 Mar 2022 21:18:57 +0100 [thread overview]
Message-ID: <20220320201857.WWcO3NwOxANQyeKOQwTViY3CJB_gM7ein1Yo_TzQ1a4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34979@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
There is an updated pull request by oynqr against master on the void-packages repository
https://github.com/oynqr/void-packages PolyMC
https://github.com/void-linux/void-packages/pull/34979
New package: PolyMC-1.1.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Testing was done on my KDE workstation and also on a clean live booted environment (only manual packages were: base-system, xorg, PolyMC). Logging in with a Microsoft account was not tested, since I don't have one. Minecraft versions 1.16.5 and 21w18a were successfully tested with the system jdk and the latest Minecraft release 1.18.1 with jdk 17 from adoptium.
I wasn't too sure which license to pick, so I just tried to be as comprehensive as possible.
Closes #34933
<!--
#### 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/34979.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PolyMC-34979.patch --]
[-- Type: text/x-diff, Size: 4169 bytes --]
From 258954f062450088bf208ddc2caea9046b6c0504 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 10 Jan 2022 11:32:22 +0100
Subject: [PATCH] New package: PolyMC-1.1.0
---
srcpkgs/PolyMC/files/README.voidlinux | 6 +++
srcpkgs/PolyMC/patches/00-fix-version.patch | 24 ++++++++++++
srcpkgs/PolyMC/template | 41 +++++++++++++++++++++
srcpkgs/PolyMC/update | 2 +
4 files changed, 73 insertions(+)
create mode 100644 srcpkgs/PolyMC/files/README.voidlinux
create mode 100644 srcpkgs/PolyMC/patches/00-fix-version.patch
create mode 100644 srcpkgs/PolyMC/template
create mode 100644 srcpkgs/PolyMC/update
diff --git a/srcpkgs/PolyMC/files/README.voidlinux b/srcpkgs/PolyMC/files/README.voidlinux
new file mode 100644
index 000000000000..16ee7f91717b
--- /dev/null
+++ b/srcpkgs/PolyMC/files/README.voidlinux
@@ -0,0 +1,6 @@
+Void-specific instructions:
+============================
+
+You may not have the correct version of java installed for running specific
+versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre
+and for older ones openjdk8-jre.
diff --git a/srcpkgs/PolyMC/patches/00-fix-version.patch b/srcpkgs/PolyMC/patches/00-fix-version.patch
new file mode 100644
index 000000000000..7513f6bffec9
--- /dev/null
+++ b/srcpkgs/PolyMC/patches/00-fix-version.patch
@@ -0,0 +1,24 @@
+--- a/PolyMC-1.1.0/buildconfig/BuildConfig.cpp.in
++++ b/PolyMC-1.1.0/buildconfig/BuildConfig.cpp.in
+@@ -30,7 +30,11 @@ Config::Config()
+
+ GIT_COMMIT = "@Launcher_GIT_COMMIT@";
+ GIT_REFSPEC = "@Launcher_GIT_REFSPEC@";
+- if(GIT_REFSPEC.startsWith("refs/heads/"))
++ if (GIT_REFSPEC == QStringLiteral("GITDIR-NOTFOUND"))
++ {
++ VERSION_CHANNEL = QStringLiteral("stable");
++ }
++ else if(GIT_REFSPEC.startsWith("refs/heads/"))
+ {
+ VERSION_CHANNEL = GIT_REFSPEC;
+ VERSION_CHANNEL.remove("refs/heads/");
+@@ -75,7 +79,7 @@ QString Config::printableVersionString() const
+ // if a build number is set, also add it to the end
+ if(VERSION_BUILD >= 0)
+ {
+- vstr += "-" + QString::number(VERSION_BUILD);
++ vstr += "_" + QString::number(VERSION_BUILD);
+ }
+ return vstr;
+ }
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
new file mode 100644
index 000000000000..bce839cdc2ed
--- /dev/null
+++ b/srcpkgs/PolyMC/template
@@ -0,0 +1,41 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.1.0
+revision=1
+create_wrksrc=yes
+build_wrksrc="PolyMC-${version}"
+_nbtversion="dc72a20b7efd304d12af2025223fad07b4b78464"
+_quazipversion="09ec1d10c6d627f895109b21728dda000cbfa7d1"
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+ -DLauncher_VERSION_BUILD=${revision}"
+hostmakedepends="openjdk11 qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="virtual?java-runtime"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-or-later"
+homepage="https://polymc.org/"
+distfiles="https://github.com/PolyMC/PolyMC/archive/${version}.tar.gz
+ https://github.com/MultiMC/libnbtplusplus/archive/${_nbtversion}.tar.gz
+ https://github.com/stachenov/quazip/archive/${_quazipversion}.tar.gz"
+checksum="4114b11a47a5380c811df890310578ddb3457f0a96caf019f388e1f551d58e99
+ 2ed9dc824007b4f7b12f807f56c98e1248b8a7aba7eca4838085092958dc1595
+ 618700e4e5f1f884e22bc8ed2c2c102305711ebf5a39296bf4c6017a4e6d4e35"
+
+case "$XBPS_TARGET_MACHINE" in
+ armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+post_extract() {
+ rmdir PolyMC-${version}/libraries/libnbtplusplus
+ rmdir PolyMC-${version}/libraries/quazip
+ mv libnbtplusplus-${_nbtversion} \
+ PolyMC-${version}/libraries/libnbtplusplus
+ mv quazip-${_quazipversion} \
+ PolyMC-${version}/libraries/quazip
+}
+
+post_install() {
+ vdoc ${FILESDIR}/README.voidlinux
+}
diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update
new file mode 100644
index 000000000000..7517baa7a2f7
--- /dev/null
+++ b/srcpkgs/PolyMC/update
@@ -0,0 +1,2 @@
+site=https://github.com/PolyMC/PolyMC/tags
+pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'
next prev parent reply other threads:[~2022-03-20 20:18 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 12:06 [PR PATCH] New package: PolyMC-1.0.5 oynqr
2022-01-10 12:19 ` [PR PATCH] [Updated] " oynqr
2022-01-21 19:32 ` sug0
2022-01-22 9:28 ` oynqr
2022-01-31 10:27 ` [PR PATCH] [Updated] " oynqr
2022-01-31 12:13 ` New package: PolyMC-1.0.6 oynqr
2022-02-16 16:09 ` Scrumplex
2022-02-17 15:54 ` [PR PATCH] [Updated] " oynqr
2022-02-17 15:55 ` oynqr
2022-02-18 3:46 ` [PR REVIEW] " ericonr
2022-02-18 3:46 ` ericonr
2022-02-18 9:23 ` [PR PATCH] [Updated] " oynqr
2022-02-18 9:26 ` [PR REVIEW] " oynqr
2022-02-18 9:26 ` oynqr
2022-02-21 0:32 ` classabbyamp
2022-02-21 9:17 ` [PR PATCH] [Updated] " oynqr
2022-02-22 11:37 ` oynqr
2022-02-22 11:47 ` oynqr
2022-02-25 12:34 ` JamiKettunen
2022-02-25 12:55 ` JamiKettunen
2022-02-25 12:55 ` [PR REVIEW] " JamiKettunen
2022-02-25 12:55 ` JamiKettunen
2022-02-25 12:59 ` JamiKettunen
2022-02-25 15:06 ` classabbyamp
2022-02-25 19:47 ` JamiKettunen
2022-02-26 9:34 ` oynqr
2022-02-26 9:36 ` Scrumplex
2022-02-26 9:39 ` oynqr
2022-02-26 9:40 ` [PR PATCH] [Updated] " oynqr
2022-02-26 9:43 ` [PR REVIEW] " oynqr
2022-02-26 14:34 ` classabbyamp
2022-02-26 15:56 ` oynqr
2022-03-12 16:44 ` [PR PATCH] [Updated] " oynqr
2022-03-13 17:18 ` [PR PATCH] [Updated] New package: PolyMC-1.1.0 oynqr
2022-03-13 17:30 ` oynqr
2022-03-13 19:08 ` [PR REVIEW] " Johnnynator
2022-03-13 21:34 ` oynqr
2022-03-14 8:38 ` [PR PATCH] [Updated] " oynqr
2022-03-14 9:19 ` oynqr
2022-03-14 9:51 ` [PR REVIEW] " paper42
2022-03-14 20:04 ` oynqr
2022-03-14 20:13 ` paper42
2022-03-14 21:45 ` oynqr
2022-03-14 22:36 ` classabbyamp
2022-03-15 6:46 ` oynqr
2022-03-15 6:49 ` [PR PATCH] [Updated] " oynqr
2022-03-15 16:16 ` [PR REVIEW] " DioEgizio
2022-03-15 17:06 ` oynqr
2022-03-15 17:40 ` sug0
2022-03-15 17:41 ` DioEgizio
2022-03-15 22:40 ` [PR REVIEW] " paper42
2022-03-16 7:53 ` oynqr
2022-03-16 7:55 ` paper42
2022-03-16 7:59 ` oynqr
2022-03-16 8:09 ` [PR REVIEW] " oynqr
2022-03-16 9:32 ` [PR PATCH] [Updated] " oynqr
2022-03-16 13:01 ` classabbyamp
2022-03-16 15:53 ` [PR PATCH] [Updated] " oynqr
2022-03-16 16:17 ` [PR REVIEW] " DioEgizio
2022-03-20 20:18 ` oynqr [this message]
2022-03-24 16:04 ` DioEgizio
2022-03-25 1:24 ` [PR REVIEW] " tibequadorian
2022-03-25 14:08 ` JamiKettunen
2022-03-25 14:24 ` [PR REVIEW] " tibequadorian
2022-03-25 14:45 ` tibequadorian
2022-04-01 20:27 ` [PR PATCH] [Updated] " oynqr
2022-04-03 16:05 ` New package: PolyMC-1.1.1 DioEgizio
2022-04-04 14:07 ` [PR PATCH] [Updated] " oynqr
2022-04-04 17:59 ` oynqr
2022-04-04 18:09 ` [PR REVIEW] " classabbyamp
2022-04-04 18:47 ` Scrumplex
2022-04-04 20:21 ` oynqr
2022-04-04 21:41 ` classabbyamp
2022-04-05 0:07 ` tibequadorian
2022-04-05 7:50 ` oynqr
2022-04-08 16:30 ` Uiyx
2022-04-08 18:17 ` DioEgizio
2022-04-08 21:23 ` [PR PATCH] [Merged]: " Johnnynator
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=20220320201857.WWcO3NwOxANQyeKOQwTViY3CJB_gM7ein1Yo_TzQ1a4@z \
--to=oynqr@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).