From f2a361ce18193317a8d3f49326de14e26369bcea73d87338e2cf70f658c56828 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Sep 2023 09:06:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=37 --- groovy18.spec | 2 ++ reproducible-builds.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 reproducible-builds.patch diff --git a/groovy18.spec b/groovy18.spec index c0ec125..8254e45 100644 --- a/groovy18.spec +++ b/groovy18.spec @@ -46,6 +46,7 @@ Patch11: groovy18-nofork.patch Patch12: groovy18-jansi.patch Patch13: groovy18-jline2.patch Patch14: groovy18-timestamp.patch +Patch15: reproducible-builds.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: antlr @@ -143,6 +144,7 @@ cp %{SOURCE3} . %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # build.xml is not compatible with Ant 1.10+ sed -i "s| depends=\"-excludeLegacyAntVersion\"||" build.xml diff --git a/reproducible-builds.patch b/reproducible-builds.patch new file mode 100644 index 0000000..92d6ae3 --- /dev/null +++ b/reproducible-builds.patch @@ -0,0 +1,33 @@ +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-14 17:55:59.552896305 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 11:05:05.035407900 +0200 +@@ -53,11 +53,11 @@ + import java.util.Arrays; + import java.util.Enumeration; + import java.util.Iterator; +-import java.util.LinkedHashSet; + import java.util.List; + import java.util.Map; + import java.util.Set; + import java.util.StringTokenizer; ++import java.util.TreeSet; + + /** + * Compiles Groovy source files. This task can take the following arguments: +@@ -127,7 +127,7 @@ + private boolean keepStubs; + private String scriptBaseClass; + +- private Set scriptExtensions = new LinkedHashSet(); ++ private Set scriptExtensions = new TreeSet(); + + /** + * Adds a path for source compilation. +@@ -658,7 +658,7 @@ + */ + protected void resetFileLists() { + compileList = new File[0]; +- scriptExtensions = new LinkedHashSet(); ++ scriptExtensions = new TreeSet(); + } + + /**