diff options
| author |   Martin Dummer <martin.dummer@gmx.net> | 2022-05-26 09:21:23 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2022-05-26 16:12:22 +0300 |
| commit | e76d4407d049879afd737694c7c276b1ce3d86c1 (patch) | |
| tree | 044ae9963dee7c89dffb605db5a702c0a640d486 /net-im/signal-cli-bin/files | |
| parent | app-mobilephone/heimdall: reset keywords for a version bump 2.0.1 (diff) | |
| download | gentoo-e76d4407d049879afd737694c7c276b1ce3d86c1.tar.gz gentoo-e76d4407d049879afd737694c7c276b1ce3d86c1.tar.bz2 gentoo-e76d4407d049879afd737694c7c276b1ce3d86c1.zip | |
net-im/signal-cli-bin: version bump to 0.10.6
new EAPI8, now depends on virtual/jre:17
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/25637
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-im/signal-cli-bin/files')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch new file mode 100644 index 000000000000..02b77bc54dd4 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch @@ -0,0 +1,33 @@ +This patch searches the jre 17 binary in the gentoo specific directories. + +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -118,13 +118,19 @@ + + + # Determine the Java command to use to start the JVM. +-if [ -n "$JAVA_HOME" ] ; then +- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +- # IBM's JDK on AIX uses strange locations for the executables +- JAVACMD=$JAVA_HOME/jre/sh/java +- else +- JAVACMD=$JAVA_HOME/bin/java +- fi ++# This package needs Java 17, ++# so we must search for matching java binaries ++for I in /usr/lib*/openjdk-17 /opt/openjdk-bin-17 /opt/openjdk-jre-bin-17; do ++ J_TRY="$I/bin/java" ++ if [ -x "$J_TRY" ] ; then ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." ++ if [ $? -eq 0 ] ; then ++ JAVACMD="$J_TRY" ++ break ++ fi ++ fi ++done ++if [ -n "$JAVACMD" ] ; then + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + |