diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-17 11:36:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-17 11:36:49 +0100 |
| commit | e2db47eaae00ec33f8971db44b68645c5d3b9590 (patch) | |
| tree | 3ec0cf16ddb5854017e134fabebe14bf8cb94a34 /net-im/signal-cli-bin/files | |
| parent | 616579b5d773c50af31ee56f00105d96ce641ca2 (diff) | |
gentoo resync : 17.08.2021
Diffstat (limited to 'net-im/signal-cli-bin/files')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch | 31 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch | 9 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch (renamed from net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch) | 12 |
3 files changed, 9 insertions, 43 deletions
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch deleted file mode 100644 index 4aa458fd7444..000000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur a/bin/signal-cli b/bin/signal-cli ---- a/bin/signal-cli 2020-10-14 18:39:40.000000000 +0200 -+++ b/bin/signal-cli 2020-11-04 09:20:25.397469784 +0100 -@@ -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 - diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch index 4a550e410bfb..b39745214944 100644 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch @@ -1,7 +1,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ---- a/bin/signal-cli 2021-03-02 20:56:06.000000000 +0100 -+++ b/bin/signal-cli 2021-05-03 12:05:45.406811750 +0200 -@@ -84,13 +84,20 @@ +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -84,13 +84,19 @@ # Determine the Java command to use to start the JVM. @@ -14,8 +14,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net> - 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 ++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." 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.5-use-working-java-version.patch index 5d9bd2909968..840c249b976f 100644 --- 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.5-use-working-java-version.patch @@ -1,11 +1,10 @@ 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 @@ - - +@@ -84,13 +84,19 @@ + + # Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -16,8 +15,7 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli - 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 ++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." @@ -30,4 +28,4 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli +if [ -n "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - + |