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
<tr><td class='sub'>Wojtek's customized 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=42231bc15df441d6426dec57283aca9ae7a03fcf'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/webkitgtk-bind-all-fonts.patch'>log</a><a href='/guix/tree/gnu/packages/patches/webkitgtk-bind-all-fonts.patch?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>tree</a><a href='/guix/commit/gnu/packages/patches/webkitgtk-bind-all-fonts.patch?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>commit</a><a href='/guix/diff/gnu/packages/patches/webkitgtk-bind-all-fonts.patch?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/webkitgtk-bind-all-fonts.patch'>
<input type='hidden' name='id' value='42231bc15df441d6426dec57283aca9ae7a03fcf'/><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=42231bc15df441d6426dec57283aca9ae7a03fcf'>root</a>/<a href='/guix/log/gnu?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>gnu</a>/<a href='/guix/log/gnu/packages?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>patches</a>/<a href='/guix/log/gnu/packages/patches/webkitgtk-bind-all-fonts.patch?id=42231bc15df441d6426dec57283aca9ae7a03fcf'>webkitgtk-bind-all-fonts.patch</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/packages/patches/webkitgtk-bind-all-fonts.patch?id=42231bc15df441d6426dec57283aca9ae7a03fcf&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-08-16 16:07:47 -0400'>2020-08-16</span></td><td><a href='/guix/commit/gnu/packages/patches/webkitgtk-bind-all-fonts.patch?id=bc549a276cd9c10202427d220d87f50eb3784d42'>gnu: webkitgtk: Expose all font locations to the bubblewrap sandbox.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/41174&gt; and &lt;https://issues.guix.gnu.org/42618&gt;.

The webkitgtk library relied on by Epiphany and others uses bubblewrap to
sandbox its process.  This sandbox was only exposing fonts relative to
XDG_DATA_HOME.  Extend it so that it honors font locations specified via
XDG_DATA_DIRS as well, which is what Guix uses.

* gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Add patch.
* gnu/local.mk: Register it.
* gnu/packages/webkit.scm (webkitgtk)[source]&lt;patches&gt;: Use it.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Leo Prikler</td></tr>