gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

games-action/prismlauncher: Remove flatpak chunk

Browse Source 
After prismlauncher 10.0.3, the flatpak/ directory doesn't exist.

This commit makes the patch not touch the flatpak/ directory,
since it fails to patch with that chunk in the patch.

Upstream commit: 3833b1e292319aebdbdebfcec24b4c105f578c3f
Signed-off-by: Leah <leah@realfx.rocks>
Part-of: https://github.com/gentoo/gentoo/pull/45613
Closes: https://github.com/gentoo/gentoo/pull/45613
Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
This commit is contained in:
Leah
2026-02-03 14:03:10 +01:00
committed by Nowa Ammerlaan
parent 5a8bdf733a
commit 4346cb0533
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
games-action/prismlauncher/files/prismlauncher-10.0.3-openjdk21.patch Normal file
View File

@@ -0,0 +1,31 @@
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/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

2
games-action/prismlauncher/prismlauncher-9999.ebuild
View File

@@ -82,7 +82,7 @@ src_prepare() {
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}-9.1-openjdk21.patch"
eapply "${FILESDIR}/${PN}-10.0.3-openjdk21.patch"
fi
}