[PR PATCH] PrismLauncher: update to 7.0.

[PR PATCH] PrismLauncher: update to 7.0.

[SpidFightFR]

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

There is a new pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-prism
https://github.com/void-linux/void-packages/pull/44326

PrismLauncher: update to 7.0.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Updated Openjdk in the template as the compatibility with prism is verified up until openjdk 20. Also added a QT5 argument as building Prism using QT6 will cause issues. It should be kept as is up until QT6-cmake is available in void repos.

A patch file from https://github.com/void-linux/void-packages/pull/44326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-prism-44326.patch --]
[-- Type: text/x-diff, Size: 1472 bytes --]

From 071da4d538688ab347b95e7f21407c7547ea41b3 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Fri, 9 Jun 2023 09:13:18 +0000
Subject: [PATCH] PrismLauncher: update to 7.0.

---
 srcpkgs/PrismLauncher/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..dbfce347e1ab 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.0
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=aef3d368aea8c5c65d6db0d258ef3d0a2965a009f1311568190d2b557ec01833
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

Re: PrismLauncher: update to 7.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1584977013

Comment:
`qt6-qmake` will never exist because it's included in `qt6-base`

this worked for me with qt6:

```diff
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8..ffff9c7254 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,19 +1,19 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.0
 revision=1
 build_style=cmake
 configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
- qt5-qmake scdoc"
-makedepends="qt5-devel"
-depends="virtual?java-runtime qt5-svg qt5-imageformats"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt6-tools
+ qt6-base scdoc"
+makedepends="qt6-base-devel qt6-qt5compat-devel"
+depends="virtual?java-runtime qt6-svg qt6-imageformats"
 short_desc="Custom launcher for Minecraft"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=aef3d368aea8c5c65d6db0d258ef3d0a2965a009f1311568190d2b557ec01833
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
        configure_args+=" -DBUILD_TESTING=0"
```

Re: PrismLauncher: update to 7.0.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1585510947

Comment:
@classabbyamp should we make different versions (qt5 and qt6) of the package? Considering that plasma isn’t on qt6 for now, it could be interesting… 

Re: PrismLauncher: update to 7.0.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1585528995

Comment:
If not, we should probably keep using qt5 as a basis, and switch to qt6 when plasma supports it.

Re: PrismLauncher: update to 7.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1585566087

Comment:
No, that doesn't matter

Re: PrismLauncher: update to 7.0.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1585663507

Comment:
@classabbyamp well in therm of theming, it can cause issues (thinking about kvantum) you sure you still wanna do it? 

Re: PrismLauncher: update to 7.0.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1585663507

Comment:
@classabbyamp well in term of theming, it can cause issues (thinking about kvantum) you sure you still wanna do it? 

Re: PrismLauncher: update to 7.0.

[oynqr]

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

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1586088656

Comment:
There's still no QT6 support with Breeze until KDE 6, what changed? https://github.com/void-linux/void-packages/pull/40044#issuecomment-1284415432

Re: PrismLauncher: update to 7.0.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1586098301

Comment:
Yup exactly, still no support for breeze theme (alongside other qt themes, for plasma). So until plasma 6 is out on void, we should keep prism on qt5. Even if it means re-making the template to add @classabbyamp patches when plasma supports qt6.

Re: PrismLauncher: update to 7.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1586121077

Comment:
fair enough

Re: [PR PATCH] [Updated] PrismLauncher: update to 7.0.

[SpidFightFR]

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

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-prism
https://github.com/void-linux/void-packages/pull/44326

PrismLauncher: update to 7.0.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Updated Openjdk in the template as the compatibility with prism is verified up until openjdk 20. Also added a QT5 argument as building Prism using QT6 will cause issues. It should be kept as is up until QT6-cmake is available in void repos.

A patch file from https://github.com/void-linux/void-packages/pull/44326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-prism-44326.patch --]
[-- Type: text/x-diff, Size: 1473 bytes --]

From 2525737ddb1550c2d97ffa0746208cebe54ce106 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sat, 17 Jun 2023 11:22:57 +0000
Subject: [PATCH] PrismLauncher: update to 7.1.

---
 srcpkgs/PrismLauncher/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..14813d2b7ac9 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

Re: PrismLauncher: update to 7.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1595718328

Comment:
back again on this PR, i changed the commit and the title of the PR as i used the template i made this morning for my prismlauncher installation.

Just in case, the first message stays true:

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Kept the changes with openjdk, i can confirm it works.
- We should stay on QT5 (`-DLauncher_QT_VERSION_MAJOR='5'` argument), as PrismLauncher both supports QT5 and QT6. Switching to QT6 brings nothing really useful, but it does bring **issues with the plasma5 D.E**, especially in terms of theming. So like i said earlier, we should remain this argument for as long as Plasma staying on QT5. Once plama QT6 is out, we could add the changes provided by @classabbyamp (https://github.com/void-linux/void-packages/pull/44326#issuecomment-1584977013).
- When building PrismLauncher, it also builds PolyMC, that should not be happening and we should fix this. Those two launchers are **separated** launchers, and PolyMC can even bring security issues related to specific changes brought by it's main maintainer.

Re: [PR PATCH] [Updated] PrismLauncher: update to 7.1.

[SpidFightFR]

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

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-prism
https://github.com/void-linux/void-packages/pull/44326

PrismLauncher: update to 7.1.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Updated Openjdk in the template as the compatibility with prism is verified up until openjdk 20. Also added a QT5 argument as building Prism using QT6 will cause issues. It should be kept as is up until QT6-cmake is available in void repos.

A patch file from https://github.com/void-linux/void-packages/pull/44326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-prism-44326.patch --]
[-- Type: text/x-diff, Size: 1713 bytes --]

From 786907f534057028ebecaf38de10516a62c124a6 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sat, 17 Jun 2023 14:39:29 +0000
Subject: [PATCH] PrismLauncher: update to 7.1.

---
 srcpkgs/PrismLauncher/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..7dd1a284c270 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"
@@ -41,9 +41,3 @@ pre_configure() {
 post_install() {
 	vdoc ${FILESDIR}/README.voidlinux
 }
-
-PolyMC_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}

Re: PrismLauncher: update to 7.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1595718328

Comment:
back again on this PR, i changed the commit and the title of the PR as i used the template i made this morning for my prismlauncher installation.

Just in case, the first message stays true:

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Kept the changes with openjdk, i can confirm it works.
- We should stay on QT5 (`-DLauncher_QT_VERSION_MAJOR='5'` argument), as PrismLauncher both supports QT5 and QT6. Switching to QT6 brings nothing really useful, but it does bring **issues with the plasma5 D.E**, especially in terms of theming. So like i said earlier, we should remain this argument for as long as Plasma staying on QT5. Once plama QT6 is out, we could add the changes provided by @classabbyamp (https://github.com/void-linux/void-packages/pull/44326#issuecomment-1584977013).
- ~~When building PrismLauncher, it also builds PolyMC~~, that should not be happening and we should fix this. Those two launchers are **separated** launchers, and PolyMC can even bring security issues related to specific changes brought by it's main maintainer.

Re: PrismLauncher: update to 7.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#issuecomment-1595777210

Comment:
> When building PrismLauncher, it also builds PolyMC

This issue got fixed.

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233077626

Comment:
No, do not remove this, it's there for a reason: to let people migrate from poly to prism smoothly

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[SpidFightFR]

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

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233089369

Comment:
But it builds Polymc alongside Prism, it causes errors during building process… With all the changes brought to Prism and the drama (and the eventual death) of Polymc, it’s fair to assume that people are aware of the change. Otherwise, they’d still be on multimc.

but fair enough.

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[SpidFightFR]

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

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233089507

Comment:
I’ll rework the template later-on, this evening

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233089952

Comment:
What errors? The polymc package is just an empty package

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[SpidFightFR]

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

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233095566

Comment:
On my void container, it went okay, but the github build verifications went crazy for some reasons… idk if it was an error or if something is wrong with this commit. Tho, when i removed polymc function, it worked with github verifications.

Re: [PR REVIEW] PrismLauncher: update to 7.1.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44326#discussion_r1233097515

Comment:
the thing that failed was [a test during the check phase](https://github.com/void-linux/void-packages/actions/runs/5297883808/jobs/9589924723#step:7:876), it had nothing to do with the polymc subpackage. if you want to run the same thing locally, run xbps-src with `-Q` to run checks for packages

Re: [PR PATCH] [Updated] PrismLauncher: update to 7.1.

[SpidFightFR]

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

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-prism
https://github.com/void-linux/void-packages/pull/44326

PrismLauncher: update to 7.1.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Updated Openjdk in the template as the compatibility with prism is verified up until openjdk 20. Also added a QT5 argument as building Prism using QT6 will cause issues. It should be kept as is up until QT6-cmake is available in void repos.

A patch file from https://github.com/void-linux/void-packages/pull/44326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-prism-44326.patch --]
[-- Type: text/x-diff, Size: 1473 bytes --]

From 75595e4a0afe9ca1d9c635ebe86c6e222a9d1a4a Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sun, 18 Jun 2023 06:21:06 +0000
Subject: [PATCH] PrismLauncher: update to 7.1.

---
 srcpkgs/PrismLauncher/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..14813d2b7ac9 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

Re: [PR PATCH] [Merged]: PrismLauncher: update to 7.1.

[classabbyamp]

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

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

PrismLauncher: update to 7.1.
https://github.com/void-linux/void-packages/pull/44326

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR
- Updated Openjdk in the template as the compatibility with prism is verified up until openjdk 20. Also added a QT5 argument as building Prism using QT6 will cause issues. It should be kept as is up until QT6-cmake is available in void repos.