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

app-office/libreoffice: use slotted dep declaration for jdk

Browse Source 
The build fails with Java 25. Therefore, introduce an upper bound for
jdk by only allowing Java 17 and Java 21.

Closes: https://bugs.gentoo.org/951189
Closes: https://github.com/gentoo/gentoo/pull/41032
Signed-off-by: Florian Schmaus <flow@gentoo.org>
This commit is contained in:
Florian Schmaus
2025-03-12 11:18:47 +01:00
parent 01aca327d8
commit f6561717e5
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
View File

@@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant:0
>=virtual/jdk-17
|| (
virtual/jdk:17
virtual/jdk:21
)
)
test? (
app-crypt/gnupg

5
app-office/libreoffice/libreoffice-25.2.2.2.ebuild
View File

@@ -245,7 +245,10 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant:0
>=virtual/jdk-17
|| (
virtual/jdk:17
virtual/jdk:21
)
)
test? (
app-crypt/gnupg

5
app-office/libreoffice/libreoffice-25.2.9999.ebuild
View File

@@ -245,7 +245,10 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant:0
>=virtual/jdk-17
|| (
virtual/jdk:17
virtual/jdk:21
)
)
test? (
app-crypt/gnupg

5
app-office/libreoffice/libreoffice-9999.ebuild
View File

@@ -237,7 +237,10 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant:0
>=virtual/jdk-17
|| (
virtual/jdk:17
virtual/jdk:21
)
)
test? (
app-crypt/gnupg