diff options
| author |   Martin Dummer <martin.dummer@gmx.net> | 2021-02-22 23:34:12 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-02-24 10:30:57 +0200 |
| commit | d98694c6b7fff63ab51e0f4081f6ce06220407e4 (patch) | |
| tree | 354e7c88e54850cddae5510a5efd56cbdfeccb3d /net-im/signal-cli-bin/files | |
| parent | x11-terms/kitty-terminfo: Update patch file for 9999 (diff) | |
| download | gentoo-d98694c6b7fff63ab51e0f4081f6ce06220407e4.tar.gz gentoo-d98694c6b7fff63ab51e0f4081f6ce06220407e4.tar.bz2 gentoo-d98694c6b7fff63ab51e0f4081f6ce06220407e4.zip | |
net-im/signal-cli-bin: version bump to 0.8.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/19605
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.8.0-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.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch new file mode 100644 index 000000000000..5d9bd2909968 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch @@ -0,0 +1,33 @@ +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +diff -Naur a/bin/signal-cli b/bin/signal-cli +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -84,13 +84,20 @@ + + + # 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 11, but Java 11 is currently not part of the gentoo eselect config system ++# so we must search for matching java binaries ++JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11" ++for I in $JAVA_DIRS ; do ++ J_TRY="$I/bin/java" ++ if [ -x "$J_TRY" ] ; then ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11." ++ 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 + |