SHA256
1
0
forked from pool/groovy18
Fridrich Strba 2023-09-26 09:06:52 +00:00 committed by Git OBS Bridge
parent c5d29bd025
commit f2a361ce18
2 changed files with 35 additions and 0 deletions

View File

@ -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

33
reproducible-builds.patch Normal file
View File

@ -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<String> scriptExtensions = new LinkedHashSet<String>();
+ private Set<String> scriptExtensions = new TreeSet<String>();
/**
* Adds a path for source compilation.
@@ -658,7 +658,7 @@
*/
protected void resetFileLists() {
compileList = new File[0];
- scriptExtensions = new LinkedHashSet<String>();
+ scriptExtensions = new TreeSet<String>();
}
/**