commit: 5710bebc77374d0137f68d9704a3559f733dfebf Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 31 20:11:28 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 1 08:55:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5710bebc
games-action/prismlauncher: drop 8.4 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-action/prismlauncher/Manifest | 1 - .../files/prismlauncher-8.2-openjdk21.patch | 44 ------ games-action/prismlauncher/metadata.xml | 3 - .../prismlauncher/prismlauncher-8.4.ebuild | 154 --------------------- 4 files changed, 202 deletions(-) diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest index 66742e3a14b3..ff9e45a576a7 100644 --- a/games-action/prismlauncher/Manifest +++ b/games-action/prismlauncher/Manifest @@ -1,2 +1 @@ -DIST prismlauncher-8.4.tar.gz 8444486 BLAKE2B c7950df3d843e370914e2a72c71847a71ab0446508a464ce04ded007b0b3170e8119bb30455d1022fda98cd49f16528a63f5589766561cfc15950c6823779b6f SHA512 24307e6f2a34c459153def5ee639c9a37d3ec3e54bf81dc7d7da8263ee58e16f2391101732889d3b00a1b923704aa21756fad4ee288665e45962032b1d9e8de9 DIST prismlauncher-9.1.tar.gz 8460672 BLAKE2B 1bb31dab88d9ca4317e61b6938f9b5aeb0b76cab3407d69b62ecf9bfa1ade3308a8927f53e020b6531fbe0cce962c7e560727298a911f07b9fec1f51b1470cd9 SHA512 5a486bb0034464be873d80512ba164fab44eb60e3abda28771387f8bed471c5a323269a5f961a0950692915698b849bb4e7de7405c26e3ad29aa8732f140a66d diff --git a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch deleted file mode 100644 index 371be5000f29..000000000000 --- a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://bugs.gentoo.org/917072 ---- a/libraries/launcher/CMakeLists.txt -+++ b/libraries/launcher/CMakeLists.txt -@@ -1,10 +1,10 @@ - cmake_minimum_required(VERSION 3.9.4) - project(launcher Java) --find_package(Java 1.7 REQUIRED COMPONENTS Development) -+find_package(Java 1.8 REQUIRED COMPONENTS Development) - - include(UseJava) - set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint) --set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7) -+set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8) - - set(SRC - org/prismlauncher/EntryPoint.java ---- a/flatpak/org.prismlauncher.PrismLauncher.yml -+++ b/flatpak/org.prismlauncher.PrismLauncher.yml -@@ -40,8 +40,8 @@ modules: - - -DLauncher_QT_VERSION_MAJOR=5 - build-options: - env: -- JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17 -- JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac -+ JAVA_HOME: "$(java-config -O)" -+ JAVA_COMPILER: "$(java-config -c)" - sources: - - type: dir - path: ../ ---- a/libraries/javacheck/CMakeLists.txt -+++ b/libraries/javacheck/CMakeLists.txt -@@ -1,10 +1,10 @@ - cmake_minimum_required(VERSION 3.9.4) - project(launcher Java) --find_package(Java 1.7 REQUIRED COMPONENTS Development) -+find_package(Java 1.8 REQUIRED COMPONENTS Development) - - include(UseJava) - set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) --set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked) -+set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked) - - set(SRC - JavaCheck.java diff --git a/games-action/prismlauncher/metadata.xml b/games-action/prismlauncher/metadata.xml index 9122a28179da..782183dddd27 100644 --- a/games-action/prismlauncher/metadata.xml +++ b/games-action/prismlauncher/metadata.xml @@ -19,7 +19,4 @@ <remote-id type="github">PrismLauncher/PrismLauncher</remote-id> </upstream> <longdescription>Prism Launcher is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription> - <use> - <flag name="qt6">Build with Qt6 support instead of the default Qt5</flag> - </use> </pkgmetadata> diff --git a/games-action/prismlauncher/prismlauncher-8.4.ebuild b/games-action/prismlauncher/prismlauncher-8.4.ebuild deleted file mode 100644 index 5042793057fb..000000000000 --- a/games-action/prismlauncher/prismlauncher-8.4.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake java-pkg-2 optfeature toolchain-funcs xdg - -DESCRIPTION="A custom, open source Minecraft launcher" -HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PrismLauncher/PrismLauncher - " - - EGIT_SUBMODULES=( - '*' '-libraries/cmark' '-libraries/extra-cmake-modules' '-libraries/filesystem' '-libraries/quazip' - '-libraries/tomlplusplus' '-libraries/zlib' - ) -else - MY_PN="PrismLauncher" - - # Let's use the vendored tarball to avoid dealing with the submodules directly - SRC_URI=" - https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz - " - - # The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV} - S="${WORKDIR}/${MY_PN}-${PV}" - - KEYWORDS="amd64 ~arm64" -fi - -# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself -# Apache-2.0 for MultiMC (PolyMC is forked from it) -# LGPL-3+ for libnbtplusplus -# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries -LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+" - -SLOT="0" - -IUSE="qt6 test" - -RESTRICT="!test? ( test )" - -MIN_QT_5_VERSION="5.12.0" -MIN_QT_6_VERSION="6.0.0" - -QT_DEPS=" - !qt6? ( - >=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtcore-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtgui-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5 - >=dev-qt/qttest-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtxml-${MIN_QT_5_VERSION}:5 - ) - - qt6? ( - >=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)] - >=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6 - ) -" - -# Required at both build-time and run-time -COMMON_DEPENDS=" - ${QT_DEPS} - - !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) - qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) - - app-text/cmark:= - dev-cpp/tomlplusplus - sys-libs/zlib -" - -BDEPEND=" - app-text/scdoc - kde-frameworks/extra-cmake-modules:0 - virtual/pkgconfig -" - -# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux, -# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this -# makes it easier to maintain than patching the CMakeLists file directly. -DEPEND=" - ${COMMON_DEPENDS} - dev-cpp/gulrak-filesystem - media-libs/libglvnd - >=virtual/jdk-1.8.0:* -" - -# QtSvg imageplugin needed at runtime for svg icons. Its used via QIcon. -# At run-time we don't depend on JDK, only JRE -# And we need more than just the GL headers -RDEPEND=" - ${COMMON_DEPENDS} - - !qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 ) - qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 ) - - >=virtual/jre-1.8.0:* - virtual/opengl -" - -src_prepare() { - cmake_src_prepare - - local java="$(java-config -f)" - local java_version=${java//[^0-9]/} - if [[ ${java_version} -ge 20 ]]; then - elog "Java 20 and up has dropped binary compatibility with java 7." - elog "${PN} is being compiled with java ${java_version}." - elog "The sources will be patched to build binary compatible with" - elog "java 8 instead of java 7. This may cause issues with very old" - elog "Minecraft versions and/or older forge versions." - elog - elog "If you experience any problems, install an older java compiler" - elog "and select it with \"eselect java\", then recompile ${PN}." - eapply "${FILESDIR}/${PN}-8.2-openjdk21.patch" - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="/usr" - # Resulting binary is named prismlauncher - -DLauncher_APP_BINARY_NAME="${PN}" - -DLauncher_BUILD_PLATFORM="Gentoo" - -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) - - -DENABLE_LTO=$(tc-is-lto) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -pkg_postinst() { - xdg_pkg_postinst - - # Original issue: https://github.com/PolyMC/PolyMC/issues/227 - optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr - - optfeature "built-in MangoHud support" games-util/mangohud - optfeature "built-in Feral Gamemode support" games-util/gamemode -}
