summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/signal-cli-bin/files')
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch (renamed from net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch)0
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch31
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch33
3 files changed, 0 insertions, 64 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.11.3-use-working-java-version.patch
index 02b77bc54dd..02b77bc54dd 100644
--- 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.11.3-use-working-java-version.patch
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
deleted file mode 100644
index 840c249b976..00000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- a/bin/signal-cli
-+++ b/bin/signal-cli
-@@ -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
-- # 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
-
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
deleted file mode 100644
index b7ead7d0327..00000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-