diff options
| author | Julien Roy <julien@jroy.ca> | 2024-03-02 12:13:05 -0500 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2024-03-03 01:12:37 +0000 |
| commit | b06898afb1f89c31e2855f030e5323f322271314 (patch) | |
| tree | 9b013dbf32a272236e4d9ee2c4591b1cb9596fe0 /net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch | |
| parent | 182fba465786101a733a5e4c049a8561f24b59b2 (diff) | |
| download | gentoo-b06898afb1f89c31e2855f030e5323f322271314.tar.gz gentoo-b06898afb1f89c31e2855f030e5323f322271314.tar.bz2 gentoo-b06898afb1f89c31e2855f030e5323f322271314.zip | |
net-im/signal-cli-bin: add 0.13.1
Signed-off-by: Julien Roy <julien@jroy.ca>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-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.13.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch new file mode 100644 index 000000000000..452435a6751c --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch @@ -0,0 +1,33 @@ +This patch searches the jre 21 binary in the gentoo specific directories. + +Signed-off-by: Julien Roy <julien@jroy.ca> + +--- 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 21, ++# so we must search for matching java binaries ++for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; 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 + |