Accepting request 945366 from Java:packages

revert upgrade to fix tycho build

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

ecj-rpmdebuginfo.patch

@@ -1,10 +1,13 @@
 ### Eclipse Workspace Patch 1.0
 #P org.eclipse.jdt.core
-Index: ecj-4.22/org/eclipse/jdt/internal/compiler/batch/Main.java
+Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
 ===================================================================
---- 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) {
+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 @@
  		this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
  	}
  

ecj.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-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>
 

ecj.spec

@@ -16,10 +16,10 @@
 #
 
 
-%global qualifier R-4.22-202111241800
+%global qualifier R-4.18-202012021800
 %global jdk15_revision 1055f2102e6e
 Name:           ecj
-Version:        4.22
+Version:        4.18
 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 >= 11
+BuildRequires:  java-devel >= 10
 BuildRequires:  javapackages-local
 BuildRequires:  unzip
 BuildArch:      noarch
@@ -56,11 +56,10 @@ the JDT Core batch compiler.
 %setup -q -c -a 1
 %patch0 -p1
 %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-%patch1 -p1
+%patch1
 %endif
 
-# debug is already present in new versions
-# sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
+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

ecjsrc-4.18.jar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed2419d5d449062cfd3e3ed48a471d292cb8993c8157a99ebc57b6cbcd3cc683
+size 2248232

ecjsrc-4.22.jar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b102a50cba74ad3a1491758892539f5ac3c0891eae4ea009a77427b8c5de8b74
-size 2358194

javaAPI.patch

@@ -1,7 +1,5 @@
-Index: ecj-4.22/build.xml
-===================================================================
---- ecj-4.22.orig/build.xml
-+++ ecj-4.22/build.xml
+--- 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 @@
  	<property name="output" value="bin" />
  	<property name="jar_file" value="ecj.jar" />
@@ -17,10 +15,10 @@ Index: ecj-4.22/build.xml
  		<javac srcdir="${basedir}" destdir="${output}"
 +					encoding="utf-8"
  					debuglevel="lines,source"
- 					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}"/>
+ 					source="1.8"
+ 					target="1.8">
+-			<compilerarg line="-Xlint:none"/>
++			<compilerarg line="-Xlint:none" value="-Xbootclasspath/p:${toString:build.path}"/>
  		</javac>
  
  		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>