Github messages for voidlinux
 help / color / mirror / Atom feed
From: oynqr <oynqr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: PolyMC-1.0.6
Date: Thu, 17 Feb 2022 16:54:16 +0100	[thread overview]
Message-ID: <20220217155416.ZQxHYuW19XmE0JXLUmuPO5lFUmaSn7EHa9XfjKoU-go@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.0.6
<!-- 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: 6320 bytes --]

From 84e6b243b2b23216a81a327de476c2f051a3e0c2 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.0.6

---
 .../PolyMC/patches/00-fix-translations.patch  | 81 +++++++++++++++++++
 srcpkgs/PolyMC/template                       | 38 +++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 srcpkgs/PolyMC/patches/00-fix-translations.patch
 create mode 100644 srcpkgs/PolyMC/template

diff --git a/srcpkgs/PolyMC/patches/00-fix-translations.patch b/srcpkgs/PolyMC/patches/00-fix-translations.patch
new file mode 100644
index 000000000000..55ab84cfc9ef
--- /dev/null
+++ b/srcpkgs/PolyMC/patches/00-fix-translations.patch
@@ -0,0 +1,81 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2507a48..b836b766 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,6 +80,9 @@ set(Launcher_MSA_CLIENT_ID "17b47edd-c884-4997-926d-9e7f9a6b4647" CACHE STRING "
+ # Bug tracker URL
+ set(Launcher_BUG_TRACKER_URL "https://github.com/PolyMC/PolyMC/issues" CACHE STRING "URL for the bug tracker.")
+ 
++# Translations Platform URL
++set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/polymc/polymc/" CACHE STRING "URL for the translations platform.")
++
+ # Discord URL
+ set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.")
+ 
+diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
+index af8845dc..cd062c9b 100644
+--- a/buildconfig/BuildConfig.cpp.in
++++ b/buildconfig/BuildConfig.cpp.in
+@@ -48,6 +48,7 @@ Config::Config()
+     META_URL = "@Launcher_META_URL@";
+ 
+     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
++    TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
+     DISCORD_URL = "@Launcher_DISCORD_URL@";
+     SUBREDDIT_URL = "@Launcher_SUBREDDIT_URL@";
+ }
+diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
+index 009fb2bc..7682ad1e 100644
+--- a/buildconfig/BuildConfig.h
++++ b/buildconfig/BuildConfig.h
+@@ -88,6 +88,7 @@ public:
+     QString META_URL;
+ 
+     QString BUG_TRACKER_URL;
++    QString TRANSLATIONS_URL;
+     QString DISCORD_URL;
+     QString SUBREDDIT_URL;
+ 
+@@ -96,7 +97,7 @@ public:
+     QString AUTH_BASE = "https://authserver.mojang.com/";
+     QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
+     QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/";
+-    QString TRANSLATIONS_BASE_URL = "https://files.multimc.org/translations/";
++    QString TRANSLATIONS_BASE_URL = "https://meta.polymc.org/translations/";
+ 
+     QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";
+ 
+diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
+index 2e744007..5f7db4d7 100644
+--- a/launcher/translations/TranslationsModel.cpp
++++ b/launcher/translations/TranslationsModel.cpp
+@@ -576,7 +576,7 @@ void TranslationsModel::downloadIndex()
+     d->m_index_job = new NetJob("Translations Index", APPLICATION->network());
+     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "index_v2.json");
+     entry->setStale(true);
+-    d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index_v2.json"), entry);
++    d->m_index_task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + "index_v2.json"), entry);
+     d->m_index_job->addNetAction(d->m_index_task);
+     connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed);
+     connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived);
+diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp
+index cf70c7b4..fc089f26 100644
+--- a/launcher/ui/widgets/LanguageSelectionWidget.cpp
++++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp
+@@ -5,6 +5,7 @@
+ #include <QHeaderView>
+ #include <QLabel>
+ #include "Application.h"
++#include "BuildConfig.h"
+ #include "translations/TranslationsModel.h"
+ 
+ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
+@@ -48,7 +49,7 @@ QString LanguageSelectionWidget::getSelectedLanguageKey() const
+ void LanguageSelectionWidget::retranslate()
+ {
+     QString text = tr("Don't see your language or the quality is poor?<br/><a href=\"%1\">Help us with translations!</a>")
+-        .arg("https://github.com/MultiMC/Launcher/wiki/Translating-MultiMC");
++        .arg(BuildConfig.TRANSLATIONS_URL);
+     helpUsLabel->setText(text);
+ 
+ }
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
new file mode 100644
index 000000000000..7acfe08ce364
--- /dev/null
+++ b/srcpkgs/PolyMC/template
@@ -0,0 +1,38 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.0.6
+revision=1
+_nbtversion="dc72a20b7efd304d12af2025223fad07b4b78464"
+_quazipversion="c9ef32de19bceb58d236f5c22382698deaec69fd"
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_LAYOUT=lin-system"
+hostmakedepends="openjdk11 qt5-host-tools qt5-qmake tar"
+makedepends="qt5-devel"
+depends="virtual?java-environment"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="Apache-2.0, GPL-3.0-or-later, LGPL-3.0-or-later, LGPL-2.1-or-later,
+ MIT, BSD-3-Clause, BSD-2-Clause"
+homepage="https://polymc.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz
+ https://github.com/MultiMC/libnbtplusplus/archive/${_nbtversion}.tar.gz
+ https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
+checksum="78c7b24c6895a37f45f563b88cf0ad5cf26dd66264383ed77909e66065df9ea6
+ 2ed9dc824007b4f7b12f807f56c98e1248b8a7aba7eca4838085092958dc1595
+ 6c5e719833c143f300d7f6101b3c04dfb1bc025e3f672d803dcef0fbce29e254"
+skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+pre_configure() {
+	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() {
+	vlicense COPYING.md
+}

  parent reply	other threads:[~2022-02-17 15:54 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 ` oynqr [this message]
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 ` [PR PATCH] [Updated] " oynqr
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=20220217155416.ZQxHYuW19XmE0JXLUmuPO5lFUmaSn7EHa9XfjKoU-go@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).