commit: 2dad9dd76c2380c45c168a447a1742240d46e1dd Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Mon Mar 11 21:23:01 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Mon Mar 11 21:24:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dad9dd7
games-action/prismlauncher: add 8.2 Bug: https://bugs.gentoo.org/917072 Bug: https://bugs.gentoo.org/873142 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> games-action/prismlauncher/Manifest | 1 + .../files/prismlauncher-8.2-openjdk21.patch | 44 ++++++++++++++++++++++ ...uncher-9999.ebuild => prismlauncher-8.2.ebuild} | 19 +++++++++- .../prismlauncher/prismlauncher-9999.ebuild | 18 ++++++++- 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest index b05838236eec..1ef436eaf319 100644 --- a/games-action/prismlauncher/Manifest +++ b/games-action/prismlauncher/Manifest @@ -1,2 +1,3 @@ DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed DIST prismlauncher-8.0.tar.gz 8430953 BLAKE2B 74fcc2d8105976cbba774ff8c727b3a57f36f6bd21ab7b3d8be98b26c0b456f78f941af192a76e170ad70fde3567358d0d8e7f47a402052503da19858bbab948 SHA512 a080d7262e2b284a1bab18c99f33e4bea7854fd946aff3f74d0a2e5c896bbf9ad90a3c4700c83162918f5269aa90b3f41e88fe94a89e197243ab3b38f8a7995c +DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad diff --git a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch new file mode 100644 index 000000000000..371be5000f29 --- /dev/null +++ b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch @@ -0,0 +1,44 @@ +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/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-8.2.ebuild similarity index 84% copy from games-action/prismlauncher/prismlauncher-9999.ebuild copy to games-action/prismlauncher/prismlauncher-8.2.ebuild index 0390171faefa..f8db7eaa5260 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-8.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake java-pkg-2 optfeature xdg -HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; DESCRIPTION="A custom, open source Minecraft launcher" +HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -108,6 +108,20 @@ RDEPEND=" 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}/${P}-openjdk21.patch" + fi + sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed' # Prevent conflicting with the user's flags @@ -125,6 +139,7 @@ src_configure(){ -DENABLE_LTO=$(usex lto) -DBUILD_TESTING=$(usex test) + -DDEBUG_ADDRESS_SANITIZER=0 ) if use debug; then diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild index 0390171faefa..efba041135b9 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake java-pkg-2 optfeature xdg -HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; DESCRIPTION="A custom, open source Minecraft launcher" +HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -108,6 +108,20 @@ RDEPEND=" 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}/${P}-openjdk21.patch" + fi + sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed' # Prevent conflicting with the user's flags
