unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Alexey Abramov <levenson@mmer.org>
To: 39742@debbugs.gnu.org
Subject: [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful patch.
Date: Sat, 22 Feb 2020 21:17:49 +0100	[thread overview]
Message-ID: <20200222201755.50425-1-levenson@mmer.org> (raw)

* gnu/packages/java.scm: Add patch
* gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch: New
  file. Allows you to run gradlew to run properly. Useful for debugging.
---
 gnu/packages/java.scm                              |  3 ++-
 .../java-openjfx-build-get_guix_jdk_version.patch  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9371901e1f..01541ee419 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2355,7 +2355,8 @@ new Date();"))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))))
+                "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))
+              (patches (search-patches "java-openjfx-build-get_guix_jdk_version.patch"))))
     (build-system ant-build-system)
     (arguments
      `(#:jar-name "java-openjfx.jar"
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..214ef9949c
--- /dev/null
+++ b/gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch
@@ -0,0 +1,14 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -742,9 +742,9 @@
+     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

             reply	other threads:[~2020-02-22 20:20 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-22 20:17 Alexey Abramov [this message]
2020-02-22 20:17 ` [bug#39744] [PATCH 2/7] gnu: java-openjfx-build: Fix indentation Alexey Abramov
2020-02-22 20:17 ` [bug#39747] [PATCH 3/7] gnu: java-openjfx-graphics: Implement a complete compilation Alexey Abramov
2020-03-04  3:00   ` Leo Famulari
2020-03-09 13:08     ` levenson
2020-03-09 12:46   ` [bug#39747] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39745] [PATCH 4/7] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-03-04  3:04   ` Leo Famulari
2020-03-09 22:08     ` [bug#39741] " levenson
2020-03-09 16:15   ` [bug#39745] [v2] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8 Alexey Abramov
2020-03-09 16:36   ` [bug#39745] [v3 1/2] " Alexey Abramov
2020-03-09 16:36     ` [bug#39745] [v3 2/2] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-03-11 10:36   ` [bug#39745] [v4 1/2] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8 Alexey Abramov
2020-03-11 10:36     ` [bug#39745] [v4 2/2] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-02-22 20:17 ` [bug#39741] [PATCH 5/7] gnu: java-openjfx-swt: " Alexey Abramov
2020-03-09 16:41   ` [bug#39741] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39743] [PATCH 6/7] gnu: java-openjfx-controls: " Alexey Abramov
2020-03-09 16:54   ` [bug#39743] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39746] [PATCH 7/7] gnu: java-openjfx-web: " Alexey Abramov
2020-03-04  3:07   ` Leo Famulari
2020-03-09 22:13     ` [bug#39741] " levenson
2020-03-17 22:17       ` Tobias Geerinckx-Rice via Guix-patches via
2020-03-09 21:41   ` [bug#39746] [v2 1/2] gnu: java-openjfx-build: Prepare a patch to build openjfx-web Alexey Abramov
2020-03-09 21:41     ` [bug#39746] [v2 2/2] gnu: java-openjfx-web: Add new variable Alexey Abramov
2020-03-14  6:10   ` [bug#39746] [v3 1/2] gnu: java-openjfx-build: Prepare a patch to build openjfx-web Alexey Abramov
2020-03-14  6:10     ` [bug#39746] [v3 2/2] gnu: java-openjfx-web: Add new variable Alexey Abramov
2020-03-04  2:56 ` [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful patch Leo Famulari
2020-03-05 20:42   ` Alexey Abramov
2020-03-05 19:09 ` Björn Höfling
2020-03-05 20:10   ` Alexey Abramov
2020-03-05 21:35   ` Björn Höfling
2020-03-08 19:40 ` [bug#39742] [v2] " Alexey Abramov
2020-03-15 18:19   ` bug#39742: " Leo Famulari
2020-03-17 21:12     ` [bug#39742] " Björn Höfling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200222201755.50425-1-levenson@mmer.org \
    --to=levenson@mmer.org \
    --cc=39742@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).