From 9d17fa82c8108649f32e85b68844b2f0e1be264bea9fe9a69ece5451fa41913d Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Mon, 27 Dec 2021 17:30:08 +0000
Subject: [PATCH] Accepting request 942804 from
 home:david.anes:branches:Java:packages

Update to 4.22

OBS-URL: https://build.opensuse.org/request/show/942804
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=49
---
 ecj-rpmdebuginfo.patch | 11 ++++-------
 ecj.changes            |  5 +++++
 ecj.spec               | 11 ++++++-----
 ecjsrc-4.18.jar        |  3 ---
 ecjsrc-4.22.jar        |  3 +++
 javaAPI.patch          | 14 ++++++++------
 6 files changed, 26 insertions(+), 21 deletions(-)
 delete mode 100644 ecjsrc-4.18.jar
 create mode 100644 ecjsrc-4.22.jar

diff --git a/ecj-rpmdebuginfo.patch b/ecj-rpmdebuginfo.patch
index 931f884..43aa1b1 100644
--- a/ecj-rpmdebuginfo.patch
+++ b/ecj-rpmdebuginfo.patch
@@ -1,13 +1,10 @@
 ### Eclipse Workspace Patch 1.0
 #P org.eclipse.jdt.core
-Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
+Index: ecj-4.22/org/eclipse/jdt/internal/compiler/batch/Main.java
 ===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
-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 @@
+--- ecj-4.22.orig/org/eclipse/jdt/internal/compiler/batch/Main.java
++++ ecj-4.22/org/eclipse/jdt/internal/compiler/batch/Main.java
+@@ -3089,6 +3089,29 @@ public void configure(String[] argv) {
  		this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
  	}
  
diff --git a/ecj.changes b/ecj.changes
index 2f61433..2fab5f2 100644
--- a/ecj.changes
+++ b/ecj.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 27 16:18:33 UTC 2021 - David Anes <david.anes@suse.com>
+
+- Upgrade to eclipse 4.22 ecj
+
 -------------------------------------------------------------------
 Mon Oct 18 21:28:05 UTC 2021 - Marcel Witte <wittemar@googlemail.com>
 
diff --git a/ecj.spec b/ecj.spec
index b1ae279..417e039 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -16,10 +16,10 @@
 #
 
 
-%global qualifier R-4.18-202012021800
+%global qualifier R-4.22-202111241800
 %global jdk15_revision 1055f2102e6e
 Name:           ecj
-Version:        4.18
+Version:        4.22
 Release:        0
 Summary:        Eclipse Compiler for Java
 License:        EPL-2.0 AND GPL-2.0-only WITH Classpath-exception-2.0
@@ -43,7 +43,7 @@ Patch0:         %{name}-rpmdebuginfo.patch
 # Include java API stubs in build with java < 15
 Patch1:         javaAPI.patch
 BuildRequires:  ant
-BuildRequires:  java-devel >= 10
+BuildRequires:  java-devel >= 11
 BuildRequires:  javapackages-local
 BuildRequires:  unzip
 BuildArch:      noarch
@@ -56,10 +56,11 @@ the JDT Core batch compiler.
 %setup -q -c -a 1
 %patch0 -p1
 %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-%patch1
+%patch1 -p1
 %endif
 
-sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
+# debug is already present in new versions
+# sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
 
 mkdir -p scripts/binary/META-INF/
 cp %{SOURCE4} scripts/binary/META-INF/MANIFEST.MF
diff --git a/ecjsrc-4.18.jar b/ecjsrc-4.18.jar
deleted file mode 100644
index a361d48..0000000
--- a/ecjsrc-4.18.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed2419d5d449062cfd3e3ed48a471d292cb8993c8157a99ebc57b6cbcd3cc683
-size 2248232
diff --git a/ecjsrc-4.22.jar b/ecjsrc-4.22.jar
new file mode 100644
index 0000000..d7545c7
--- /dev/null
+++ b/ecjsrc-4.22.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b102a50cba74ad3a1491758892539f5ac3c0891eae4ea009a77427b8c5de8b74
+size 2358194
diff --git a/javaAPI.patch b/javaAPI.patch
index b71762e..5fca284 100644
--- a/javaAPI.patch
+++ b/javaAPI.patch
@@ -1,5 +1,7 @@
---- build.xml.orig	2020-09-02 22:05:12.000000000 +0200
-+++ build.xml	2021-03-16 14:41:19.331235267 +0100
+Index: ecj-4.22/build.xml
+===================================================================
+--- ecj-4.22.orig/build.xml
++++ ecj-4.22/build.xml
 @@ -18,16 +18,20 @@
  	<property name="output" value="bin" />
  	<property name="jar_file" value="ecj.jar" />
@@ -15,10 +17,10 @@
  		<javac srcdir="${basedir}" destdir="${output}"
 +					encoding="utf-8"
  					debuglevel="lines,source"
- 					source="1.8"
- 					target="1.8">
--			<compilerarg line="-Xlint:none"/>
-+			<compilerarg line="-Xlint:none" value="-Xbootclasspath/p:${toString:build.path}"/>
+ 					debug="true"
+ 					release="11">
+-			<compilerarg line="-Xlint:none --patch-module java.compiler=javax17api.jar"/>
++			<compilerarg line="-Xlint:none --patch-module java.compiler=${toString:build.path}"/>
  		</javac>
  
  		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>