From 5a83bf797a57066e6ad3ceb9eb45f97dd8ef98fc6cb55db419f3b7b40c2b73f8 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 22 Mar 2022 19:43:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=18

---
 groovy18-nofork.patch | 21 +++++++++++++++++++++
 groovy18.changes      | 10 ++++++++++
 groovy18.spec         |  5 +++++
 3 files changed, 36 insertions(+)
 create mode 100644 groovy18-nofork.patch

diff --git a/groovy18-nofork.patch b/groovy18-nofork.patch
new file mode 100644
index 0000000..a5968bf
--- /dev/null
+++ b/groovy18-nofork.patch
@@ -0,0 +1,21 @@
+diff -urEbwB groovy-core-GROOVY_1_8_9.orig/build.xml groovy-core-GROOVY_1_8_9/build.xml
+--- groovy-core-GROOVY_1_8_9.orig/build.xml	2013-02-15 09:42:29.000000000 +0100
++++ groovy-core-GROOVY_1_8_9/build.xml	2022-03-22 20:27:42.099395524 +0100
+@@ -180,7 +180,7 @@
+             <exclude name="groovy/ui/**/*.java"/>
+         </javac>
+         <java classname="org.codehaus.groovy.tools.DgmConverter"
+-              fork="yes"
++              fork="no"
+               failonerror="true">
+             <classpath>
+                 <pathelement path="${mainClassesDirectory}"/>
+@@ -194,7 +194,7 @@
+ 
+     <target name="-stagedcompile-groovy" depends="-initGroovyc">
+         <groovyc srcdir="${mainSourcePath}" destdir="${mainClassesDirectory}" 
+-                 fork="true" stacktrace="true"
++                 fork="false" stacktrace="true"
+                  memorymaximumsize="${groovycMain_mx}">
+             <classpath>
+                 <pathelement path="${mainClassesDirectory}"/>
diff --git a/groovy18.changes b/groovy18.changes
index de4289a..de16686 100644
--- a/groovy18.changes
+++ b/groovy18.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Mar 22 19:41:23 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * groovy18-nofork.patch
+    + do not fork the groovyc and java tasks in the ant build.xml
+      file, so that the ANT_OPTS are propagated to the tasks
+- Add opens of java.lang from java.base module to all unnamed
+  * fixes build with jdk17
+
 -------------------------------------------------------------------
 Mon Mar 21 15:03:23 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/groovy18.spec b/groovy18.spec
index b46c17f..f6ee9af 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -42,6 +42,7 @@ Patch7:         groovy18-securitymanager.patch
 Patch8:         groovy18-notarget.patch
 Patch9:         groovy18-amgiguous-function-calls.patch
 Patch10:        groovy18-asm7.patch
+Patch11:        groovy18-nofork.patch
 BuildRequires:  ant
 BuildRequires:  ant-antlr
 BuildRequires:  antlr
@@ -135,6 +136,7 @@ cp %{SOURCE3} .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # build.xml is not compatible with Ant 1.10+
 sed -i "s| depends=\"-excludeLegacyAntVersion\"||" build.xml
@@ -179,6 +181,9 @@ build-jar-repository target/lib/compile glassfish-servlet-api glassfish-jsp-api/
 # Build
 # TODO: Build at least tests, maybe examples
 export CLASSPATH=$(build-classpath ant/ant-antlr)
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+export ANT_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED"
+%endif
 %ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
         createJars javadoc