Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ecj for openSUSE:Factory checked in
at 2021-12-28 12:26:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ecj (Old)
and /work/SRC/openSUSE:Factory/.ecj.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecj"
Tue Dec 28 12:26:21 2021 rev:28 rq:942824 version:4.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/ecj/ecj.changes 2021-10-19 23:04:11.901283056
+0200
+++ /work/SRC/openSUSE:Factory/.ecj.new.2520/ecj.changes 2021-12-28
12:26:55.260497736 +0100
@@ -1,0 +2,5 @@
+Mon Dec 27 16:18:33 UTC 2021 - David Anes <david.a...@suse.com>
+
+- Upgrade to eclipse 4.22 ecj
+
+-------------------------------------------------------------------
Old:
----
ecjsrc-4.18.jar
New:
----
ecjsrc-4.22.jar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ecj.spec ++++++
--- /var/tmp/diff_new_pack.itMCWv/_old 2021-12-28 12:26:55.904498224 +0100
+++ /var/tmp/diff_new_pack.itMCWv/_new 2021-12-28 12:26:55.912498230 +0100
@@ -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 @@
# 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 @@
%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
++++++ ecj-rpmdebuginfo.patch ++++++
--- /var/tmp/diff_new_pack.itMCWv/_old 2021-12-28 12:26:55.960498266 +0100
+++ /var/tmp/diff_new_pack.itMCWv/_new 2021-12-28 12:26:55.960498266 +0100
@@ -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);
}
++++++ javaAPI.patch ++++++
--- /var/tmp/diff_new_pack.itMCWv/_old 2021-12-28 12:26:55.992498291 +0100
+++ /var/tmp/diff_new_pack.itMCWv/_new 2021-12-28 12:26:55.996498293 +0100
@@ -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"/>
