diff options
author | Martin Dummer <martin.dummer@gmx.net> | 2021-12-08 21:38:34 +0100 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2021-12-17 15:12:49 +0200 |
commit | d6c947050d5003749556aa785c73f6044b0a2ce3 (patch) | |
tree | 7b44467f0378e3bb2079997ccb011694c285fad1 /net-im/signal-cli-bin/files | |
parent | app-misc/trash-cli: Drop old testing 0.21.5.25 (diff) | |
download | gentoo-d6c947050d5003749556aa785c73f6044b0a2ce3.tar.gz gentoo-d6c947050d5003749556aa785c73f6044b0a2ce3.tar.bz2 gentoo-d6c947050d5003749556aa785c73f6044b0a2ce3.zip |
net-im/signal-cli-bin: version bump to 0.9.2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
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.9.2-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.9.2-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch new file mode 100644 index 000000000000..b7ead7d0327a --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch @@ -0,0 +1,33 @@ +This patch searches the jre 11 binary in the gentoo specific directories. + +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +--- a/bin/signal-cli 1970-01-02 01:00:00.000000000 +0100 ++++ b/bin/signal-cli 2021-12-08 20:43:30.490613238 +0100 +@@ -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 11, but Java 11 is currently not part of the gentoo eselect config system ++# so we must search for matching java binaries ++for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; 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 + |