Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME

Icedtea contains guix in its version, so build.gradle failes to run. Openjfx
packaging is not trivial, so you will probably need to try build it with
gradlew.

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index df82f63..2c626cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -742,9 +742,9 @@ try {
     if (inStream.readLine() != null) {
         String v = inStream.readLine();
         if (v != null) {
-            int ib = v.indexOf(" (build ");
+            int ib = v.indexOf(" (guix build ");
             if (ib != -1) {
-                String ver = v.substring(ib + 8, v.size() - 1);
+                String ver = v.substring(ib + 13, v.size() - 1);

                 defineProperty("jdkRuntimeVersion", ver)
                 defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0])
2.24.1
='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=080b8279be2fea11a21ac0400cb865268dd29620'>refs</a><a class='active' href='/guix/log/tests/import-utils.scm'>log</a><a href='/guix/tree/tests/import-utils.scm?id=080b8279be2fea11a21ac0400cb865268dd29620'>tree</a><a href='/guix/commit/tests/import-utils.scm?id=080b8279be2fea11a21ac0400cb865268dd29620'>commit</a><a href='/guix/diff/tests/import-utils.scm?id=080b8279be2fea11a21ac0400cb865268dd29620'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/import-utils.scm'>
<input type='hidden' name='id' value='080b8279be2fea11a21ac0400cb865268dd29620'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=080b8279be2fea11a21ac0400cb865268dd29620'>root</a>/<a href='/guix/log/tests?id=080b8279be2fea11a21ac0400cb865268dd29620'>tests</a>/<a href='/guix/log/tests/import-utils.scm?id=080b8279be2fea11a21ac0400cb865268dd29620'>import-utils.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/import-utils.scm?id=080b8279be2fea11a21ac0400cb865268dd29620&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-19 15:53:28 +0200'>2023-07-19</span></td><td><a href='/guix/commit/tests/import-utils.scm?id=b9bd1bcce995299065252e192c96ae302c9b0e81'>import/utils: beautify-description: Wrap class names in @code{...}.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/utils.scm (beautify-description): Add procedure to wrap words in
@code{...} markup.
* tests/import-utils.scm: Add two tests.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2023-04-07 18:00:08 +0200'>2023-04-07</span></td><td><a href='/guix/commit/tests/import-utils.scm?id=5481aaacb5f60ba43d8db7e51cb7cc967d5eb55e'>packages: Remove 'origin-sha256' procedure.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/packages.scm (origin-sha256): Remove procedure.
* tests/import-utils.scm (test-import-utils)
[alist-&gt;package with explicit source]: Use content-hash-value.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-12-31 14:48:46 +0100'>2022-12-31</span></td><td><a href='/guix/commit/tests/import-utils.scm?id=4046405f73da2fb9b89ca4a3ad455b56b3e826aa'>tests: import-utils: Ignore extra keyword arguments.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/import-utils.scm ("recursive-import", "recursive-import: skip false
packages (toplevel)", "recursive-import: skip false packages (dependency)"):
Do not try to match all arguments.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-11-18 15:44:38 +0100'>2022-11-18</span></td><td><a href='/guix/commit/tests/import-utils.scm?id=fd5e642513ea08cc9ba3b4197bcbf0b8d37ae966'>import/utils: spdx-string-&gt;license: Support '+' operator.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, '+' was supported only via special cases for deprecated
GNU identifiers like 'GPL-N+'.  This commit adds support
for other uses of '+', such as 'AFL-2.0+' and 'LPPL-1.0+'.

Strictly speaking, '+' is an operator, not part of the SPDX license
identifier, but it is useful to handle it here.

* guix/import/utils.scm (spdx-string-&gt;license): Support '+' operator.
* tests/import-utils.scm ("spdx-string-&gt;license"): Test it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Philip McGrath</td></tr>
<tr><td><span title='2022-11-18 15:44:38 +0100'>2022-11-18</span></td><td><a href='/guix/commit/tests/import-utils.scm?id=07482dc0511350d596fdd25f7645dd6f4f91313b'>import/utils: spdx-string-&gt;license: Match case-insensitively.</a><span class='msg-avail'>...<span class='msg-tooltip'>SPDX specifies that license identifiers (unlike the 'AND', 'OR', and
'WITH' operators) are matched case-insensitively.

* guix/import/utils.scm (%spdx-license-identifiers): New variable.
(spdx-string-&gt;license): Search in '%spdx-license-identifiers' using
'string-ci=?'.
* tests/import-utils.scm ("spdx-string-&gt;license"): New test.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Philip McGrath</td></tr>