all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 4ebdadc671ce4c0c6d16444f01d793468c5cbeb7 1171 bytes (raw)
name: gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
 
From d156313340d3edcd78751ea8ed5e66c7668275c3 Mon Sep 17 00:00:00 2001
From: Alexey Abramov <levenson@mmer.org>
Date: Sun, 8 Mar 2020 20:07:22 +0100
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])
@@ -3540,4 +3540,3 @@ compileTargets { t ->
         }
     )
 }
-
-- 
2.24.1


debug log:

solving 4ebdadc671 ...
found 4ebdadc671 in https://yhetil.org/guix/20200308194000.16724-1-levenson@mmer.org/ ||
	https://yhetil.org/guix/20200517135138.1651512-1-levenson@mmer.org/

applying [1/1] https://yhetil.org/guix/20200308194000.16724-1-levenson@mmer.org/
diff --git a/gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch b/gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch
new file mode 100644
index 0000000000..4ebdadc671

1:33: trailing whitespace.
 
1:41: trailing whitespace.
-- 
Checking patch gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch...
1:43: new blank line at EOF.
+
Applied patch gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch cleanly.
warning: 3 lines add whitespace errors.

skipping https://yhetil.org/guix/20200517135138.1651512-1-levenson@mmer.org/ for 4ebdadc671
index at:
100644 4ebdadc671ce4c0c6d16444f01d793468c5cbeb7	gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.