From 2879921c90f79d0d786239df67690d45f7a7c18b Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 6 Jan 2026 19:19:07 -0800 Subject: [PATCH] fix (prism-launcher): install new file from 10.0.0 release, deprecate Qt5 versions, use new macros (#8962) (#8963) --- .../prismlauncher-nightly.spec | 30 +++++-------------- anda/games/prismlauncher/prismlauncher.spec | 25 +++++----------- 2 files changed, 14 insertions(+), 41 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 58a2a2d16e..4066bdd7a5 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -9,28 +9,17 @@ %global commit_date 20260107 %global snapshot_info %{commit_date}.%{shortcommit} -%bcond_without qt6 - # Change this variables if you want to use custom keys # Leave blank if you want to build Prism Launcher without MSA id or curseforge api key %define msa_id default %define curseforge_key default -%if %{with qt6} %global qt_version 6 %global min_qt_version 6 -%else -%global qt_version 5 -%global min_qt_version 5.12 -%endif %global build_platform terra -%if %{with qt6} Name: prismlauncher-nightly -%else -Name: prismlauncher-qt5-nightly -%endif Version: 10.0^%{snapshot_info} Release: 1%?dist Summary: Minecraft launcher with ability to manage multiple instances @@ -71,14 +60,9 @@ BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version} -%if %{with qt6} BuildRequires: cmake(Qt6Core5Compat) -%endif BuildRequires: pkgconfig(libcmark) -%if 0%{fedora} < 38 -BuildRequires: cmark -%endif BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -102,11 +86,8 @@ Recommends: flite Suggests: gamemode Conflicts: %{real_name} -Conflicts: %{real_name}-qt5 -%if %{without qt6} -Conflicts: %{real_name}-nightly -%endif +Obsoletes: %{real_name}-qt5 <= 9.4 %description A custom launcher for Minecraft that allows you to easily manage @@ -158,16 +139,19 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo. %{_datadir}/%{nice_name}/JavaCheck.jar %{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/%{nice_name}/NewLaunchLegacy.jar -%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop +%{_appsdir}/org.prismlauncher.PrismLauncher.desktop %{_metainfodir}/%{appid}.metainfo.xml -%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg -%{_datadir}/icons/hicolor/256x256/apps/org.prismlauncher.PrismLauncher.png +%{_scalableiconsdir}/org.prismlauncher.PrismLauncher.svg +%{_hicolordir}/256x256/apps/org.prismlauncher.PrismLauncher.png %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories %{_mandir}/man?/prismlauncher.* %changelog +* Tue Jan 06 2026 Owen Zimmerman - 10.0.0-1 +- Remove Qt5 version + * Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1 - use system quazip-qt and tomlplusplus diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index f0173630ad..3fa2b79bf4 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -1,6 +1,5 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%bcond_without qt6 %global appid org.prismlauncher.PrismLauncher # Change this variables if you want to use custom keys @@ -8,21 +7,12 @@ %define msa_id default %define curseforge_key default -%if %{with qt6} %global qt_version 6 %global min_qt_version 6 -%else -%global qt_version 5 -%global min_qt_version 5.12 -%endif %global build_platform terra -%if %{with qt6} Name: prismlauncher -%else -Name: prismlauncher-qt5 -%endif Version: 10.0.0 Release: 1%?dist Summary: Minecraft launcher with ability to manage multiple instances @@ -63,10 +53,7 @@ BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(gamemode) -%if %{with qt6} BuildRequires: cmake(Qt6Core5Compat) -%endif - BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) @@ -93,9 +80,7 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode -%if %{without qt6} -Conflicts: %{real_name} -%endif +Obsoletes: %{real_name}-qt5-nightly <= 9.4 %description A custom launcher for Minecraft that allows you to easily manage @@ -146,8 +131,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %{_datadir}/%{nice_name}/JavaCheck.jar %{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/%{nice_name}/NewLaunchLegacy.jar -%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg +%{_appsdir}/org.prismlauncher.PrismLauncher.desktop +%{_scalableiconsdir}/org.prismlauncher.PrismLauncher.svg +%{_hicolordir}/256x256/apps/org.prismlauncher.PrismLauncher.png %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories %{_mandir}/man?/prismlauncher.* @@ -155,6 +141,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %changelog +* Tue Jan 06 2026 Owen Zimmerman - 10.0.0-1 +- Update to 10.0.0, remove Qt5 version + * Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2 - update to 8.4. Add quazip-qt deps