Skip to content

Commit 7491b69

Browse files
committed
Update jline3 to version 3.30.4
1 parent 14b767d commit 7491b69

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

patches/jline3/0001-Load-native-library-form-usr-lib-jline.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 519aa218831e6ebf30a7d6985f5a9bef2e291a4f Mon Sep 17 00:00:00 2001
1+
From a9575efafc0981774b504df745040688e948fa8b Mon Sep 17 00:00:00 2001
22
From: Mikolaj Izdebski <mizdebsk@redhat.com>
33
Date: Wed, 26 Feb 2025 07:26:26 +0100
44
Subject: [PATCH 1/2] Load native library form /usr/lib/jline
@@ -9,10 +9,10 @@ Forwarded: not-needed
99
1 file changed, 3 insertions(+)
1010

1111
diff --git a/native/src/main/java/org/jline/nativ/JLineNativeLoader.java b/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
12-
index 47a053df..98c84d28 100644
12+
index 6236d8f3..6684dd1d 100644
1313
--- a/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
1414
+++ b/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
15-
@@ -328,6 +328,9 @@ public class JLineNativeLoader {
15+
@@ -499,6 +499,9 @@ public class JLineNativeLoader {
1616

1717
// As a last resort try from java.library.path
1818
String javaLibraryPath = System.getProperty("java.library.path", "");
@@ -23,5 +23,5 @@ index 47a053df..98c84d28 100644
2323
if (ldPath.isEmpty()) {
2424
continue;
2525
--
26-
2.48.1
26+
2.50.1
2727

patches/jline3/0002-Remove-optional-dependency-on-universalchardet.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From be3495103741d920d5118a8db1aef5ade09e8080 Mon Sep 17 00:00:00 2001
1+
From 5fcacd2eaf72aa0c60d92b276ca880fe13060bbd Mon Sep 17 00:00:00 2001
22
From: Mikolaj Izdebski <mizdebsk@redhat.com>
33
Date: Wed, 26 Feb 2025 16:26:49 +0100
44
Subject: [PATCH 2/2] Remove optional dependency on universalchardet
@@ -9,18 +9,18 @@ Forwarded: not-needed
99
1 file changed, 12 deletions(-)
1010

1111
diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
12-
index 765cea7c..47501ee1 100644
12+
index 491d0bc3..be5748c1 100644
1313
--- a/builtins/src/main/java/org/jline/builtins/Nano.java
1414
+++ b/builtins/src/main/java/org/jline/builtins/Nano.java
15-
@@ -47,7 +47,6 @@ import org.jline.terminal.Terminal.Signal;
16-
import org.jline.terminal.Terminal.SignalHandler;
15+
@@ -51,7 +51,6 @@ import org.jline.terminal.impl.MouseSupport;
1716
import org.jline.utils.*;
1817
import org.jline.utils.InfoCmp.Capability;
18+
import org.jline.utils.Status;
1919
-import org.mozilla.universalchardet.UniversalDetector;
2020

2121
import static org.jline.builtins.SyntaxHighlighter.*;
2222
import static org.jline.keymap.KeyMap.KEYMAP_LENGTH;
23-
@@ -249,17 +248,6 @@ public class Nano implements Editor {
23+
@@ -380,17 +379,6 @@ public class Nano implements Editor {
2424
}
2525
byte[] bytes = bos.toByteArray();
2626

@@ -39,5 +39,5 @@ index 765cea7c..47501ee1 100644
3939
try (BufferedReader reader =
4040
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes), charset))) {
4141
--
42-
2.48.1
42+
2.50.1
4343

project/jline3.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
url=https://github.com/jline/jline3
22
ref=jline-@.@.@
3-
version=3.29.0
4-
#rpm_name=
3+
version=3.30.4

0 commit comments

Comments
 (0)