From 07bb95be4176f2b0f80a9d7945f693716c3eb414a2a6d372812080d4d6928644 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Sep 2023 18:11:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=45 --- ...ch => groovy18-reproducible-bytecode.patch | 21 ++++++++++--------- groovy18.changes | 8 +++++++ groovy18.spec | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) rename reproducible-builds.patch => groovy18-reproducible-bytecode.patch (92%) diff --git a/reproducible-builds.patch b/groovy18-reproducible-bytecode.patch similarity index 92% rename from reproducible-builds.patch rename to groovy18-reproducible-bytecode.patch index 31b6558..2fbb439 100644 --- a/reproducible-builds.patch +++ b/groovy18-reproducible-bytecode.patch @@ -10,7 +10,7 @@ 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 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 @@ package org.codehaus.groovy.ast; @@ -21,28 +21,29 @@ import java.util.Map; /** -@@ -107,17 +107,17 @@ +@@ -107,18 +107,15 @@ VariableScope copy = new VariableScope(); copy.clazzScope = clazzScope; if (declaredVariables.size() > 0) { - copy.declaredVariables = new HashMap(); -+ copy.declaredVariables = new LinkedHashMap(); - copy.declaredVariables.putAll(declaredVariables); +- copy.declaredVariables.putAll(declaredVariables); ++ copy.declaredVariables = new LinkedHashMap(declaredVariables); } copy.inStaticContext = inStaticContext; copy.parent = parent; if (referencedClassVariables.size() > 0) { - copy.referencedClassVariables = new HashMap(); -+ copy.referencedClassVariables = new LinkedHashMap(); - copy.referencedClassVariables.putAll(referencedClassVariables); +- copy.referencedClassVariables.putAll(referencedClassVariables); ++ copy.referencedClassVariables = new LinkedHashMap(referencedClassVariables); } if (referencedLocalVariables.size() > 0) { - copy.referencedLocalVariables = new HashMap(); -+ copy.referencedLocalVariables = new LinkedHashMap(); - copy.referencedLocalVariables.putAll(referencedLocalVariables); +- copy.referencedLocalVariables.putAll(referencedLocalVariables); ++ copy.referencedLocalVariables = new LinkedHashMap(referencedLocalVariables); } copy.resolvesDynamic = resolvesDynamic; -@@ -126,7 +126,7 @@ + return copy; +@@ -126,7 +123,7 @@ public void putDeclaredVariable(Variable var) { if (declaredVariables == Collections.EMPTY_MAP) @@ -51,7 +52,7 @@ declaredVariables.put(var.getName(), var); } -@@ -144,13 +144,13 @@ +@@ -144,13 +141,13 @@ public void putReferencedLocalVariable(Variable var) { if (referencedLocalVariables == Collections.EMPTY_MAP) diff --git a/groovy18.changes b/groovy18.changes index 00a69c8..a5a54c1 100644 --- a/groovy18.changes +++ b/groovy18.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 26 18:10:22 UTC 2023 - Fridrich Strba + +- 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 diff --git a/groovy18.spec b/groovy18.spec index 8254e45..4153875 100644 --- a/groovy18.spec +++ b/groovy18.spec @@ -46,7 +46,7 @@ Patch11: groovy18-nofork.patch Patch12: groovy18-jansi.patch Patch13: groovy18-jline2.patch Patch14: groovy18-timestamp.patch -Patch15: reproducible-builds.patch +Patch15: groovy18-reproducible-bytecode.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: antlr