* [PR PATCH] PolyMC: update old urls and api keys
@ 2022-10-18 22:32 classabbyamp
2022-10-18 22:51 ` [PR REVIEW] " classabbyamp
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-18 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages polymc-urls
https://github.com/void-linux/void-packages/pull/40030
PolyMC: update old urls and api keys
another mitigation until the PrismLauncher fork releases
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/40030.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-polymc-urls-40030.patch --]
[-- Type: text/x-diff, Size: 3456 bytes --]
From 501a7580d04e75e999c7b2173994d20dbb99dc76 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 18 Oct 2022 18:31:04 -0400
Subject: [PATCH] PolyMC: update old urls and api keys
another mitigation until the PrismLauncher fork releases
---
srcpkgs/PolyMC/patches/prism.patch | 13 +++++++++++++
srcpkgs/PolyMC/template | 19 ++++++++++++++++---
srcpkgs/PolyMC/update | 2 +-
3 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/PolyMC/patches/prism.patch
diff --git a/srcpkgs/PolyMC/patches/prism.patch b/srcpkgs/PolyMC/patches/prism.patch
new file mode 100644
index 000000000000..fb8fbd826274
--- /dev/null
+++ b/srcpkgs/PolyMC/patches/prism.patch
@@ -0,0 +1,13 @@
+--- a/buildconfig/BuildConfig.h
++++ b/buildconfig/BuildConfig.h
+@@ -144,8 +144,8 @@
+ QString LIBRARY_BASE = "https://libraries.minecraft.net/";
+ QString AUTH_BASE = "https://authserver.mojang.com/";
+ QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
+- QString FMLLIBS_BASE_URL = "https://files.polymc.org/fmllibs/";
+- QString TRANSLATIONS_BASE_URL = "https://i18n.polymc.org/";
++ QString FMLLIBS_BASE_URL = "https://files.prismlauncher.org/fmllibs/";
++ QString TRANSLATIONS_BASE_URL = "https://i18n.prismlauncher.org/";
+
+ QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";
+
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
index 350b51fd49d3..3b892f53f3f8 100644
--- a/srcpkgs/PolyMC/template
+++ b/srcpkgs/PolyMC/template
@@ -1,10 +1,9 @@
# Template file for 'PolyMC'
pkgname=PolyMC
version=1.4.2
-revision=2
+revision=3
build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void
- -DLauncher_VERSION_BUILD=${revision} -DLauncher_META_URL=https://meta.scrumplex.rocks/v1/"
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_VERSION_BUILD=${revision}"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
qt5-qmake scdoc"
makedepends="qt5-devel"
@@ -24,6 +23,20 @@ case "$XBPS_TARGET_MACHINE" in
armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
esac
+# XXX: remove these and update file when doing PrismLauncher migration
+configure_args+=" -DLauncher_META_URL=https://meta.scrumplex.rocks/v1/
+ -DLauncher_NEWS_RSS_URL=https://prismlauncher.org/feed/feed.xml
+ -DLauncher_NEWS_OPEN_URL=https://prismlauncher.org/news
+ -DLauncher_HELP_URL=https://prismlauncher.org/wiki/help-pages/%1
+ -DLauncher_BUG_TRACKER_URL=https://github.com/PrismLauncher/PrismLauncher/issues
+ -DLauncher_TRANSLATIONS_URL=https://hosted.weblate.org/projects/prismlauncher/launcher/
+ -DLauncher_MATRIX_URL=https://matrix.to/#/#prismlauncher:matrix.org
+ -DLauncher_DISCORD_URL=https://discord.gg/prismlauncher
+ -DLauncher_SUBREDDIT_URL=https://www.reddit.com/r/PrismLauncher/
+ -DLauncher_MSA_CLIENT_ID=c36a9fb6-4f2a-41ff-90bd-ae7cc92031eb
+ -DLauncher_CURSEFORGE_API_KEY=\$2a\$10\$wuAJuNZuted3NORVmpgUC.m8sI.pv1tOPKZyBgLFGjxFp/br0lZCC
+ -DLauncher_Git=https://github.com/PrismLauncher/PrismLauncher"
+
post_patch() {
vsed -i buildconfig/BuildConfig.cpp.in \
-e 's/+build\./_/'
diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update
index 7517baa7a2f7..cc6e127e099b 100644
--- a/srcpkgs/PolyMC/update
+++ b/srcpkgs/PolyMC/update
@@ -1,2 +1,2 @@
-site=https://github.com/PolyMC/PolyMC/tags
+site=https://github.com/PrismLauncher/PrismLauncher/tags
pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] PolyMC: update old urls and api keys
2022-10-18 22:32 [PR PATCH] PolyMC: update old urls and api keys classabbyamp
@ 2022-10-18 22:51 ` classabbyamp
2022-10-19 17:53 ` classabbyamp
2022-10-19 17:53 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-18 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40030#discussion_r998779545
Comment:
these urls 404 right now, should they get updated now or wait?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: PolyMC: update old urls and api keys
2022-10-18 22:32 [PR PATCH] PolyMC: update old urls and api keys classabbyamp
2022-10-18 22:51 ` [PR REVIEW] " classabbyamp
@ 2022-10-19 17:53 ` classabbyamp
2022-10-19 17:53 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-19 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40030#issuecomment-1284374416
Comment:
nevermind, #40044
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: PolyMC: update old urls and api keys
2022-10-18 22:32 [PR PATCH] PolyMC: update old urls and api keys classabbyamp
2022-10-18 22:51 ` [PR REVIEW] " classabbyamp
2022-10-19 17:53 ` classabbyamp
@ 2022-10-19 17:53 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-19 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
There's a closed pull request on the void-packages repository
PolyMC: update old urls and api keys
https://github.com/void-linux/void-packages/pull/40030
Description:
another mitigation until the PrismLauncher fork releases
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-19 17:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-18 22:32 [PR PATCH] PolyMC: update old urls and api keys classabbyamp
2022-10-18 22:51 ` [PR REVIEW] " classabbyamp
2022-10-19 17:53 ` classabbyamp
2022-10-19 17:53 ` [PR PATCH] [Closed]: " classabbyamp
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).