rpm/groovy18
SHA256
1
0
Fork 0
forked from pool/groovy18
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=45

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-26 18:11:32 +00:00 committed by Git OBS Bridge
parent 4a72a27ddb
commit 07bb95be41
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
reproducible-builds.patch → groovy18-reproducible-bytecode.patch
View File

@ -10,7 +10,7 @@
return res; return res;
} }
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 13:31:23.339542759 +0200 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 13:31:23.339542759 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 19:45:48.534571007 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 20:06:22.392879780 +0200
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
package org.codehaus.groovy.ast; package org.codehaus.groovy.ast;
@ -21,28 +21,29 @@
import java.util.Map; import java.util.Map;
/** /**
@@ -107,17 +107,17 @@ @@ -107,18 +107,15 @@
VariableScope copy = new VariableScope(); VariableScope copy = new VariableScope();
copy.clazzScope = clazzScope; copy.clazzScope = clazzScope;
if (declaredVariables.size() > 0) { if (declaredVariables.size() > 0) {
- copy.declaredVariables = new HashMap<String, Variable>(); - copy.declaredVariables = new HashMap<String, Variable>();
+ copy.declaredVariables = new LinkedHashMap<String, Variable>(); - copy.declaredVariables.putAll(declaredVariables);
copy.declaredVariables.putAll(declaredVariables); + copy.declaredVariables = new LinkedHashMap<String, Variable>(declaredVariables);
} }
copy.inStaticContext = inStaticContext; copy.inStaticContext = inStaticContext;
copy.parent = parent; copy.parent = parent;
if (referencedClassVariables.size() > 0) { if (referencedClassVariables.size() > 0) {
- copy.referencedClassVariables = new HashMap<String, Variable>(); - copy.referencedClassVariables = new HashMap<String, Variable>();
+ copy.referencedClassVariables = new LinkedHashMap<String, Variable>(); - copy.referencedClassVariables.putAll(referencedClassVariables);
copy.referencedClassVariables.putAll(referencedClassVariables); + copy.referencedClassVariables = new LinkedHashMap<String, Variable>(referencedClassVariables);
} }
if (referencedLocalVariables.size() > 0) { if (referencedLocalVariables.size() > 0) {
- copy.referencedLocalVariables = new HashMap<String, Variable>(); - copy.referencedLocalVariables = new HashMap<String, Variable>();
+ copy.referencedLocalVariables = new LinkedHashMap<String, Variable>(); - copy.referencedLocalVariables.putAll(referencedLocalVariables);
copy.referencedLocalVariables.putAll(referencedLocalVariables); + copy.referencedLocalVariables = new LinkedHashMap<String, Variable>(referencedLocalVariables);
} }
copy.resolvesDynamic = resolvesDynamic; copy.resolvesDynamic = resolvesDynamic;
@@ -126,7 +126,7 @@ return copy;
@@ -126,7 +123,7 @@
public void putDeclaredVariable(Variable var) { public void putDeclaredVariable(Variable var) {
if (declaredVariables == Collections.EMPTY_MAP) if (declaredVariables == Collections.EMPTY_MAP)
@ -51,7 +52,7 @@
declaredVariables.put(var.getName(), var); declaredVariables.put(var.getName(), var);
} }
@@ -144,13 +144,13 @@ @@ -144,13 +141,13 @@
public void putReferencedLocalVariable(Variable var) { public void putReferencedLocalVariable(Variable var) {
if (referencedLocalVariables == Collections.EMPTY_MAP) if (referencedLocalVariables == Collections.EMPTY_MAP)

8
groovy18.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Sep 26 18:10:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* groovy18-reproducible-bytecode.patch
+ backport of upstream changes to have interface methods and
collected variables always in the same order
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 16:34:06 UTC 2023 - Fridrich Strba <fstrba@suse.com> Thu Sep 14 16:34:06 UTC 2023 - Fridrich Strba <fstrba@suse.com>

2
groovy18.spec
View File

@ -46,7 +46,7 @@ Patch11: groovy18-nofork.patch
Patch12: groovy18-jansi.patch Patch12: groovy18-jansi.patch
Patch13: groovy18-jline2.patch Patch13: groovy18-jline2.patch
Patch14: groovy18-timestamp.patch Patch14: groovy18-timestamp.patch
Patch15: reproducible-builds.patch Patch15: groovy18-reproducible-bytecode.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-antlr BuildRequires: ant-antlr
BuildRequires: antlr BuildRequires: antlr