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
Guix</td><td class='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=eb169d36e5c8f3c15b7716310c76829451a71fcd'>refs</a><a class='active' href='/guix/log/gnu/services/security-token.scm'>log</a><a href='/guix/tree/gnu/services/security-token.scm?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>tree</a><a href='/guix/commit/gnu/services/security-token.scm?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>commit</a><a href='/guix/diff/gnu/services/security-token.scm?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/security-token.scm'>
<input type='hidden' name='id' value='eb169d36e5c8f3c15b7716310c76829451a71fcd'/><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=eb169d36e5c8f3c15b7716310c76829451a71fcd'>root</a>/<a href='/guix/log/gnu?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>gnu</a>/<a href='/guix/log/gnu/services?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=eb169d36e5c8f3c15b7716310c76829451a71fcd'>security-token.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/gnu/services/security-token.scm?id=eb169d36e5c8f3c15b7716310c76829451a71fcd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-07-03 20:13:42 +0200'>2021-07-03</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=e789ce538ed848bacb8f4eb5742f78b965ccf57c'>services: pcscd: Fix daemon signal handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>"pcscd" wouldn't handle SIGTERM as it inherit ignoring this signal (and
others) from its parent shepherd; fork+exec-command restore signal
handling.  Fixes &lt;https://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd)[start]: Use
fork+exec-command to start "pcscd".
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2021-06-19 23:49:18 +0200'>2021-06-19</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=4bed8486d4c0a4ff142903b8bc1584ce84767355'>services: pcscd: Cleanup socket when started.</a><span class='msg-avail'>...<span class='msg-tooltip'>Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL),
it won't start again because of it's socket already existing.

* gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
Remove existing socket file.
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2020-12-13 00:35:49 +0100'>2020-12-13</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=a4cd86ff4b7a9dd4bf1a5320b8121b470e381b67'>gnu: htop: Update to 3.0.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/admin.scm (htop): Update to 3.0.3.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-12-12 23:10:05 +0100'>2020-12-12</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=8f2656f1debffe92ea088f4c88cfe8ec560b2ba3'>services: pcscd-shepherd-service: Fix PID file location.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd-shepherd-service): Look for
pcscd.pid in /run instead of /var/run.

Reported by Raffael Stocker &lt;r.stocker@mnet-mail.de&gt;.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>