Accepting request 963277 from Java:packages

Fix build with jdk 17

OBS-URL: https://build.opensuse.org/request/show/963277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecj?expand=0&rev=30

ecj-rpmdebuginfo.patch

@@ -7,7 +7,7 @@ retrieving revision 1.327
 diff -u -r1.327 Main.java
 --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	21 Apr 2008 15:00:59 -0000	1.327
 +++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	20 Nov 2008 19:26:57 -0000
-@@ -2609,6 +2609,29 @@
+@@ -3097,6 +3097,29 @@ public void configure(String[] argv) {
  		this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
  	}
  

ecj.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Mar 20 13:35:05 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * encoding.patch
+    + the encoding needs to be set for all JDK versions
+- Modified patch:
+  * ecj-rpmdebuginfo.patch
+    + rediff
+  * javaAPI.patch
+    + extract the encoding part to a separate patch
+
 -------------------------------------------------------------------
 Mon Oct 18 21:28:05 UTC 2021 - Marcel Witte <wittemar@googlemail.com>
 

ecj.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ecj
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,8 +40,9 @@ Source3:        java15api.pom
 Source4:        MANIFEST.MF
 # Always generate debug info when building RPMs
 Patch0:         %{name}-rpmdebuginfo.patch
+Patch1:         encoding.patch
 # Include java API stubs in build with java < 15
-Patch1:         javaAPI.patch
+Patch2:         javaAPI.patch
 BuildRequires:  ant
 BuildRequires:  java-devel >= 10
 BuildRequires:  javapackages-local
@@ -55,8 +56,9 @@ the JDT Core batch compiler.
 %prep
 %setup -q -c -a 1
 %patch0 -p1
+%patch1 -p1
 %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-%patch1
+%patch2
 %endif
 
 sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
@@ -79,7 +81,7 @@ jar -cf java15api.jar -C build/classes .
 # Remove everything except the jar, since ant looks for java files in "."
 rm -rf java15api-src build/classes
 
-ant \
+%ant \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
 	-Djavaapi=java15api.jar \
 %endif

encoding.patch

@@ -0,0 +1,10 @@
+--- ecj-4.18.orig/build.xml	2022-03-20 14:23:39.947886348 +0100
++++ ecj-4.18/build.xml	2022-03-20 14:26:28.600913037 +0100
+@@ -24,6 +24,7 @@
+ 		<mkdir dir="${output}" />
+ 
+ 		<javac srcdir="${basedir}" destdir="${output}"
++					encoding="utf-8"
+ 					debuglevel="lines,source"
+ 					source="1.8"
+ 					target="1.8">

javaAPI.patch

@@ -1,6 +1,6 @@
 --- build.xml.orig	2020-09-02 22:05:12.000000000 +0200
 +++ build.xml	2021-03-16 14:41:19.331235267 +0100
-@@ -18,16 +18,20 @@
+@@ -18,6 +18,9 @@
  	<property name="output" value="bin" />
  	<property name="jar_file" value="ecj.jar" />
  
@@ -10,10 +10,7 @@
  	<target name="build">
  		<delete file="${basedir}/${jar_file}" failonerror="no" />
  		<delete dir="${output}" failonerror="no" />
- 		<mkdir dir="${output}" />
- 
- 		<javac srcdir="${basedir}" destdir="${output}"
-+					encoding="utf-8"
+@@ -28,7 +31,7 @@
  					debuglevel="lines,source"
  					source="1.8"
  					target="1.8">