Hello community, here is the log from the commit of package jline for openSUSE:Factory checked in at 2019-09-30 15:58:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jline (Old) and /work/SRC/openSUSE:Factory/.jline.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jline" Mon Sep 30 15:58:47 2019 rev:24 rq:733686 version:2.14.6 Changes: -------- --- /work/SRC/openSUSE:Factory/jline/jline.changes 2019-07-02 10:38:49.190620527 +0200 +++ /work/SRC/openSUSE:Factory/.jline.new.2352/jline.changes 2019-09-30 15:58:50.553305468 +0200 @@ -1,0 +2,7 @@ +Fri Sep 27 07:34:45 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Added patch: + * jline-java8compat.patch + + build binaries compatible with Java 8 + +------------------------------------------------------------------- New: ---- jline-java8compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jline.spec ++++++ --- /var/tmp/diff_new_pack.oubt8L/_old 2019-09-30 15:58:51.117303967 +0200 +++ /var/tmp/diff_new_pack.oubt8L/_new 2019-09-30 15:58:51.121303956 +0200 @@ -25,6 +25,7 @@ URL: https://github.com/jline/jline2 Source0: https://github.com/jline/jline2/archive/jline-%{version}.tar.gz Source1: %{name}-build.xml +Patch0: jline-java8compat.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: hawtjni-runtime @@ -50,6 +51,7 @@ %prep %setup -q -n jline2-jline-%{version} +%patch0 -p1 %pom_change_dep org.fusesource.jansi:jansi org.fusesource.jansi:jansi:1.12 cp %{SOURCE1} build.xml mkdir -p lib ++++++ jline-java8compat.patch ++++++ diff -urEbwB jline2-jline-2.14.6/src/main/java/jline/internal/InputStreamReader.java jline2-jline-2.14.6.new/src/main/java/jline/internal/InputStreamReader.java --- jline2-jline-2.14.6/src/main/java/jline/internal/InputStreamReader.java 2018-03-26 11:14:37.000000000 +0200 +++ jline2-jline-2.14.6.new/src/main/java/jline/internal/InputStreamReader.java 2019-09-27 09:31:17.518979605 +0200 @@ -13,6 +13,7 @@ import java.io.OutputStreamWriter; import java.io.Reader; import java.io.UnsupportedEncodingException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; @@ -68,7 +69,7 @@ decoder = Charset.defaultCharset().newDecoder().onMalformedInput( CodingErrorAction.REPLACE).onUnmappableCharacter( CodingErrorAction.REPLACE); - bytes.limit(0); + ((Buffer)bytes).limit(0); } /** @@ -101,7 +102,7 @@ throw (UnsupportedEncodingException) new UnsupportedEncodingException(enc).initCause(e); } - bytes.limit(0); + ((Buffer)bytes).limit(0); } /** @@ -118,7 +119,7 @@ dec.averageCharsPerByte(); this.in = in; decoder = dec; - bytes.limit(0); + ((Buffer)bytes).limit(0); } /** @@ -136,7 +137,7 @@ decoder = charset.newDecoder().onMalformedInput( CodingErrorAction.REPLACE).onUnmappableCharacter( CodingErrorAction.REPLACE); - bytes.limit(0); + ((Buffer)bytes).limit(0); } /** @@ -262,7 +263,7 @@ } else if (was_red == 0) { break; } - bytes.limit(bytes.limit() + was_red); + ((Buffer)bytes).limit(bytes.limit() + was_red); needInput = false; } @@ -273,8 +274,8 @@ // compact the buffer if no space left if (bytes.limit() == bytes.capacity()) { bytes.compact(); - bytes.limit(bytes.position()); - bytes.position(0); + ((Buffer)bytes).limit(bytes.position()); + ((Buffer)bytes).position(0); } needInput = true; } else {
