[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41360] [PATCH v2 1/9] gnu: java-openjfx-build: Add helpful patch.
From: |
Alexey Abramov |
Subject: |
[bug#41360] [PATCH v2 1/9] gnu: java-openjfx-build: Add helpful patch. |
Date: |
Sat, 30 May 2020 18:41:15 +0200 |
* gnu/packages/java.scm (java-openjfx-build)[source]: Use it.
* gnu/packages/patches/java-openjfx-build-jdk_version.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Alexey Abramov <levenson@mmer.org>
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 3 ++-
.../java-openjfx-build-jdk_version.patch | 27 +++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/java-openjfx-build-jdk_version.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 768943a67a..cbf0a20a9e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1110,6 +1110,7 @@ dist_patch_DATA =
\
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
\
%D%/packages/patches/java-commons-collections-fix-java8.patch \
%D%/packages/patches/java-jeromq-fix-tests.patch \
+ %D%/packages/patches/java-openjfx-build-jdk_version.patch \
%D%/packages/patches/java-powermock-fix-java-files.patch \
%D%/packages/patches/java-simple-xml-fix-tests.patch \
%D%/packages/patches/java-svg-salamander-Fix-non-det.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b12c3ca95c..d569ed57d6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2499,7 +2499,8 @@ new Date();"))
#t))
(sha256
(base32
- "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))))
+ "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))
+ (patches (search-patches
"java-openjfx-build-jdk_version.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "java-openjfx.jar"
diff --git a/gnu/packages/patches/java-openjfx-build-jdk_version.patch
b/gnu/packages/patches/java-openjfx-build-jdk_version.patch
new file mode 100644
index 0000000000..7be954467a
--- /dev/null
+++ b/gnu/packages/patches/java-openjfx-build-jdk_version.patch
@@ -0,0 +1,27 @@
+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
--
2.26.2
- [bug#41360] [PATCH 07/12] gnu: java-openjfx-controls: Add new variable., (continued)
- [bug#41360] [PATCH 07/12] gnu: java-openjfx-controls: Add new variable., Alexey Abramov, 2020/05/17
- [bug#41360] [PATCH 03/12] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/05/17
- [bug#41360] [PATCH 09/12] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/17
- [bug#41360] [PATCH 04/12] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8, Alexey Abramov, 2020/05/17
- [bug#41360] [PATCH 08/12] gnu: java-openjfx-build: Prepare a patch to build openjfx-web., Alexey Abramov, 2020/05/17
- [bug#41360] [PATCH 01/12] gnu: java-openjfx-build: Add helpful patch., Ludovic Courtès, 2020/05/23
- [bug#41360] [PATCH v2 1/9] gnu: java-openjfx-build: Add helpful patch.,
Alexey Abramov <=
- [bug#41360] [PATCH v2 2/9] gnu: java-openjfx-build: Fix indentation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 5/9] gnu: java-openjfx-swing: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 4/9] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8, Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 6/9] gnu: java-openjfx-swt: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 7/9] gnu: java-openjfx-controls: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 9/9] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 8/9] gnu: java-openjfx-build: Prepare a patch to build openjfx-web., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 3/9] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH 09/12] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH 03/12] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/05/30