Fridrich Strba 2023-09-25 16:48:43 +00:00 committed by Git OBS Bridge
parent 57ac56c378
commit 38c6f22417
2 changed files with 56 additions and 0 deletions

55
jython-java8compat.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/build.xml b/build.xml
index 52dfe71..43d7649 100644
--- a/build.xml
+++ b/build.xml
@@ -91,8 +91,8 @@ informix.jar = ../support/jdbc-4.10.12.jar
<property file="${user.home}/ant.properties" />
<property file="${basedir}/ant.properties" />
- <property name="jython.java.version" value="1.8" />
- <property name="jdk.source.version" value="1.8" />
+ <property name="jython.java.version" value="8" />
+ <property name="jdk.source.version" value="8" />
<!-- Designate the official release encoded in parts. In normal times, this is the *next*
official release, e.g. 2.7.2b2 while working towards 2.7.2b2, and sys.version will be
@@ -681,6 +681,7 @@ The text for an official release would continue like ...
destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
+ release="${jdk.target.version}"
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}"
@@ -743,6 +744,7 @@ The text for an official release would continue like ...
<javac destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
+ release="${jdk.target.version}"
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}"
@@ -763,6 +765,7 @@ The text for an official release would continue like ...
destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
+ release="${jdk.target.version}"
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}"
@@ -795,6 +798,7 @@ The text for an official release would continue like ...
destdir="${test.compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
+ release="${jdk.target.version}"
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}"
@@ -1209,6 +1213,7 @@ The text for an official release would continue like ...
destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
+ release="${jdk.target.version}"
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}"

View File

@ -34,6 +34,7 @@ Patch2: %{name}-cachedir.patch
Patch3: %{name}-fix-tty-detection.patch
Patch4: %{name}-reproducible-now.patch
Patch5: %{name}-reproducible-builds.patch
Patch6: %{name}-java8compat.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: antlr3-java