From c1f16f5e762f78ff7b1baa4e1b81fcefc2c25c38 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 23 Apr 2024 17:42:52 +0000 Subject: [PATCH] prismlauncher-qt5{,-nightly}: drop (#1111) --- .../0001-find-cmark-with-pkgconfig.patch | 79 ------- anda/games/prismlauncher-qt5-nightly/anda.hcl | 8 - .../prismlauncher-qt5-nightly.spec | 198 ------------------ .../prismlauncher-qt5-nightly/update.rhai | 11 - anda/games/prismlauncher-qt5/anda.hcl | 5 - .../prismlauncher-qt5/prismlauncher-qt5.spec | 188 ----------------- anda/games/prismlauncher-qt5/update.rhai | 1 - 7 files changed, 490 deletions(-) delete mode 100644 anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch delete mode 100644 anda/games/prismlauncher-qt5-nightly/anda.hcl delete mode 100644 anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec delete mode 100644 anda/games/prismlauncher-qt5-nightly/update.rhai delete mode 100644 anda/games/prismlauncher-qt5/anda.hcl delete mode 100644 anda/games/prismlauncher-qt5/prismlauncher-qt5.spec delete mode 100644 anda/games/prismlauncher-qt5/update.rhai diff --git a/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch deleted file mode 100644 index d41ef66bec..0000000000 --- a/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001 -From: seth -Date: Sun, 15 Jan 2023 14:47:49 -0500 -Subject: [PATCH] find cmark with pkgconfig - -Signed-off-by: seth ---- - cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - create mode 100755 cmake/Findcmark.cmake - -diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake -new file mode 100755 -index 00000000..9858e5df ---- /dev/null -+++ b/cmake/Findcmark.cmake -@@ -0,0 +1,59 @@ -+# SPDX-FileCopyrightText: 2019 Black Hat -+# SPDX-License-Identifier: GPL-3.0-only -+ -+# -+# CMake module to search for the cmark library -+# -+ -+# first try to find cmark-config.cmake -+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/' -+find_package(cmark CONFIG QUIET) -+if(cmark_FOUND AND TARGET cmark::cmark) -+ # found it! -+ return() -+endif() -+ -+find_package(PkgConfig QUIET) -+if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_CMARK QUIET cmark) -+endif() -+ -+if(NOT CMARK_INCLUDE_DIR) -+ find_path(CMARK_INCLUDE_DIR -+ NAMES cmark.h -+ PATHS -+ ${PC_CMARK_INCLUDEDIR} -+ ${PC_CMARK_INCLUDE_DIRS} -+ /usr/include -+ /usr/local/include) -+endif() -+ -+if(NOT CMARK_LIBRARY) -+ find_library(CMARK_LIBRARY -+ NAMES cmark -+ HINTS -+ ${PC_CMARK_LIBDIR} -+ ${PC_CMARK_LIBRARY_DIRS} -+ /usr/lib -+ /usr/local/lib) -+endif() -+ -+if(NOT TARGET cmark::cmark) -+ add_library(cmark::cmark UNKNOWN IMPORTED) -+ set_target_properties(cmark::cmark -+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES -+ ${CMARK_INCLUDE_DIR}) -+ set_property(TARGET cmark::cmark APPEND -+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY}) -+endif() -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(cmark -+ DEFAULT_MSG -+ CMARK_INCLUDE_DIR -+ CMARK_LIBRARY) -+ -+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR) -+ -+set(CMARK_LIBRARIES ${CMARK_LIBRARY}) -+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR}) --- -2.39.0 - diff --git a/anda/games/prismlauncher-qt5-nightly/anda.hcl b/anda/games/prismlauncher-qt5-nightly/anda.hcl deleted file mode 100644 index 3f85a804ff..0000000000 --- a/anda/games/prismlauncher-qt5-nightly/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "prismlauncher-qt5-nightly.spec" - } - labels { - nightly = "1" - } -} diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec deleted file mode 100644 index 2ff2eca4ce..0000000000 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ /dev/null @@ -1,198 +0,0 @@ -%global real_name prismlauncher -%global nice_name PrismLauncher - -%global commit 5eeb3b77686299c1d8a938ae8b1950608a94c982 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f -%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 -%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 - -%global commit_date 20240423 -%global snapshot_info %{commit_date}.%{shortcommit} - -%bcond_with 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: 9.0^%{snapshot_info} -Release: 1%?dist -Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later -Group: Amusements/Games -URL: https://prismlauncher.org/ -Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz -Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz -Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz -Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Patch0: 0001-find-cmark-with-pkgconfig.patch - -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-17-openjdk-devel -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib -BuildRequires: cmake(ghc_filesystem) -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{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) - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils - -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -Requires: javapackages-filesystem -Recommends: java-21-openjdk -Recommends: java-17-openjdk -Suggests: java-1.8.0-openjdk - -# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr -# libflite needed for using narrator in minecraft -Recommends: flite -# Prism supports enabling gamemode -Suggests: gamemode - -Conflicts: %{real_name} -Conflicts: %{real_name}-qt5 -%if %{without qt6} -Conflicts: %{real_name}-nightly -%endif - - -%description -A custom launcher for Minecraft that allows you to easily manage -multiple installations of Minecraft at once (Fork of MultiMC) - - -%prep -%autosetup -p1 -n PrismLauncher-%{commit} - -tar -xzf %{SOURCE1} -C libraries -tar -xvf %{SOURCE2} -C libraries -tar -xvf %{SOURCE3} -C libraries - -rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/ -mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus -mv -f libraries/quazip-%{quazip_commit} libraries/quazip -mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus - -# Do not set RPATH -sed -i "s|\$ORIGIN/||" CMakeLists.txt - - -%build -%cmake \ - -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ - -DLauncher_BUILD_PLATFORM="%{build_platform}" \ - %if "%{msa_id}" != "default" - -DLauncher_MSA_CLIENT_ID="%{msa_id}" \ - %endif - %if "%{curseforge_key}" != "default" - -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \ - %endif - -DBUILD_TESTING=OFF - -%cmake_build - - -%install -%cmake_install - - -%check -%ctest - - -%files -%doc README.md -%license LICENSE COPYING.md -%dir %{_datadir}/%{nice_name} -%{_bindir}/%{real_name} -%{_datadir}/%{nice_name}/NewLaunch.jar -%{_datadir}/%{nice_name}/JavaCheck.jar -%{_datadir}/%{nice_name}/qtlogging.ini -%{_datadir}/%{nice_name}/NewLaunchLegacy.jar -%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml -%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg -%{_datadir}/mime/packages/modrinth-mrpack-mime.xml -%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories -%{_mandir}/man?/prismlauncher.* - - -%changelog -* Wed Jul 26 2023 seth - 8.0^20230726.4f00012-1 -- remove terra-fractureiser-detector from recommends, use proper build platform, - and add patches for epel/older fedora versions - -* Sun Jul 23 2023 seth - 8.0^20230722.273d75f-1 -- update submodules, version, & use autorelease - -* Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1 -- specify jdk 17 + cleanup outdated patches/scriptlets - -* Sun May 14 2023 seth - 7.0^20230513.c5aff7c-1 -- add qtlogging.ini to files list - -* Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1 -- recommend flite to support narrator in minecraft - -* Fri Feb 03 2023 seth - 7.0^20230203.58d9ced-1 -- disable tests and explicitly require cmark - -* Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1 -- add 0001-find-cmark-with-pkgconfig.patch - -* Fri Jan 13 2023 seth - 7.0^20230113.3de681d-1 -- add cmark as a build dep - -* Tue Jan 03 2023 seth - 7.0^20230102.4b12c85-1 -- add qlogging categories - -* Mon Dec 05 2022 seth - 6.0^20221204.79d5bef-1 -- revise file to better follow fedora packaging guidelines and add java 8 as a - dependency - -* Thu Nov 10 2022 seth - 5.1-0.1.20221110.e6d057f -- add package to Amusements/Games - -* Sun Nov 06 2022 seth - 5.0-0.1.20221105.9fb80a2 -- update installed files - -* Thu Oct 27 2022 seth - 5.0-0.1.20221027.610b971 -- initial commit diff --git a/anda/games/prismlauncher-qt5-nightly/update.rhai b/anda/games/prismlauncher-qt5-nightly/update.rhai deleted file mode 100644 index a7437e7cae..0000000000 --- a/anda/games/prismlauncher-qt5-nightly/update.rhai +++ /dev/null @@ -1,11 +0,0 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher")); - if rpm.changed() { - rpm.release(); - let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt"); - let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1); - let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1); - rpm.global("commit_date", date()); - rpm.version(`${maj}.${min}^%{snapshot_info}`); - } -} diff --git a/anda/games/prismlauncher-qt5/anda.hcl b/anda/games/prismlauncher-qt5/anda.hcl deleted file mode 100644 index 11769d102b..0000000000 --- a/anda/games/prismlauncher-qt5/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "prismlauncher-qt5.spec" - } -} diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec deleted file mode 100644 index 62c7b7b60b..0000000000 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ /dev/null @@ -1,188 +0,0 @@ -%global real_name prismlauncher -%global nice_name PrismLauncher -%bcond_with 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 -%else -Name: prismlauncher-qt5 -%endif -Version: 8.2 -Release: 2%?dist -Summary: Minecraft launcher with ability to manage multiple instances -# see COPYING.md for more information -# each file in the source also contains a SPDX-License-Identifier header that declares its license -License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later -Group: Amusements/Games -URL: https://prismlauncher.org/ -Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz - -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-17-openjdk-devel -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib -BuildRequires: cmake(ghc_filesystem) -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} - -%if %{with qt6} -BuildRequires: cmake(Qt6Core5Compat) -%endif - -BuildRequires: pkgconfig(libcmark) -BuildRequires: pkgconfig(scdoc) -BuildRequires: pkgconfig(zlib) - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils - -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -Requires: javapackages-filesystem -Recommends: java-21-openjdk -Recommends: java-17-openjdk -Suggests: java-1.8.0-openjdk - -# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr -# libflite needed for using narrator in minecraft -Recommends: flite - -# Prism supports enabling gamemode -Suggests: gamemode - -%if %{without qt6} -Conflicts: %{real_name} -%endif - -%description -A custom launcher for Minecraft that allows you to easily manage -multiple installations of Minecraft at once (Fork of MultiMC) - - -%prep -%autosetup -n PrismLauncher-%{version} - -rm -rf libraries/{extra-cmake-modules,filesystem,zlib} - -# Do not set RPATH -sed -i "s|\$ORIGIN/||" CMakeLists.txt - - -%build -%cmake \ - -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ - -DLauncher_BUILD_PLATFORM="%{build_platform}" \ - %if "%{msa_id}" != "default" - -DLauncher_MSA_CLIENT_ID="%{msa_id}" \ - %endif - %if "%{curseforge_key}" != "default" - -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \ - %endif - -DBUILD_TESTING=OFF - -%cmake_build - - -%install -%cmake_install - - -%check -%ctest - - -%files -%doc README.md -%license LICENSE COPYING.md -%dir %{_datadir}/%{nice_name} -%{_bindir}/prismlauncher -%{_datadir}/%{nice_name}/NewLaunch.jar -%{_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 -%{_datadir}/mime/packages/modrinth-mrpack-mime.xml -%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories -%{_mandir}/man?/prismlauncher.* -%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml - - -%changelog -* Wed Apr 03 2024 seth - 8.2-2 -- move JREs to weak deps, add java 21 for snapshots - -* Wed Jul 26 2023 seth - 7.2-2 -- remove terra-fractureiser-detector from recommends, use proper build platform - -* Thu Jun 08 2023 seth - 6.3-3 -- specify jdk 17 + cleanup outdated patches/scriptlets - -* Mon Mar 20 2023 seth - 6.3-2 -- recommend flite to support narrator in minecraft - -* Sat Feb 04 2023 seth - 6.3-1 -- update to 6.3 - -* Mon Dec 19 2022 seth - 6.1-2 -- start using non-headless java deps - -* Mon Dec 12 2022 seth - 6.0-1 -- update to 6.0 - -* Mon Dec 05 2022 seth - 5.2-3 -- revise file to better follow fedora packaging guidelines and add java 8 as a - dependency - -* Tue Nov 15 2022 seth - 5.2-2 -- use newer version of toml++ to fix issues on aarch64 - -* Tue Nov 15 2022 seth - 5.2-1 -- update to 5.2 - -* Thu Nov 10 2022 seth - 5.1-2 -- add package to Amusements/Games - -* Tue Nov 01 2022 seth - 5.1-1 -- update to 5.1 - -* Wed Oct 19 2022 seth - 5.0-3 -- add missing deps and build with qt6 by default - -* Wed Oct 19 2022 seth - 5.0-2 -- add change-jars-path.patch to allow for package-specific jar path - -* Wed Oct 19 2022 seth - 5.0-1 -- update to version 5.0 - -* Tue Oct 18 2022 Cappy Ishihara - 1.4.2.git981e9cf-0.2.20221018.981e9cf -- Update provides and obsoletes - -* Tue Oct 18 2022 seth - 1.4.2.git981e9cf-0.1.20221018.981e9cf -- start using qt6 - -* Tue Oct 18 2022 Cappy Ishihara - 1.4.2-1 -- Repackaged as Prism Launcher diff --git a/anda/games/prismlauncher-qt5/update.rhai b/anda/games/prismlauncher-qt5/update.rhai deleted file mode 100644 index 67913ff0b4..0000000000 --- a/anda/games/prismlauncher-qt5/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("PrismLauncher/PrismLauncher"));