From patchwork Sun Mar 8 19:40:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 20589 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 26B1327BBEA; Sun, 8 Mar 2020 19:41:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9D30627BBE4 for ; Sun, 8 Mar 2020 19:41:14 +0000 (GMT) Received: from localhost ([::1]:32874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jB1nW-0001MK-5u for patchwork@mira.cbaines.net; Sun, 08 Mar 2020 15:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38160) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jB1nM-0001Jp-Lt for guix-patches@gnu.org; Sun, 08 Mar 2020 15:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jB1nK-0004En-CY for guix-patches@gnu.org; Sun, 08 Mar 2020 15:41:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43316) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jB1nK-0004Ef-9I for guix-patches@gnu.org; Sun, 08 Mar 2020 15:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jB1nK-0003SE-7Q for guix-patches@gnu.org; Sun, 08 Mar 2020 15:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39742] [v2] gnu: java-openjfx-build: Add helpful patch. References: <20200222201755.50425-1-levenson@mmer.org> In-Reply-To: <20200222201755.50425-1-levenson@mmer.org> Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Mar 2020 19:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39742 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39742@debbugs.gnu.org Cc: Alexey Abramov Received: via spool by 39742-submit@debbugs.gnu.org id=B39742.158369645513255 (code B ref 39742); Sun, 08 Mar 2020 19:41:02 +0000 Received: (at 39742) by debbugs.gnu.org; 8 Mar 2020 19:40:55 +0000 Received: from localhost ([127.0.0.1]:49289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB1nC-0003Rj-O2 for submit@debbugs.gnu.org; Sun, 08 Mar 2020 15:40:55 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:31231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB1n8-0003RV-Ge for 39742@debbugs.gnu.org; Sun, 08 Mar 2020 15:40:53 -0400 Received: from delta (unknown [10.147.19.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 390C29CC2D; Sun, 8 Mar 2020 19:10:01 +0000 (UTC) From: Alexey Abramov Date: Sun, 8 Mar 2020 20:40:00 +0100 Message-Id: <20200308194000.16724-1-levenson@mmer.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 3 +- ...a-openjfx-build-get_guix_jdk_version.patch | 37 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch diff --git a/gnu/local.mk b/gnu/local.mk index f6c56ceb28..0bcbde7301 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1033,6 +1033,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-get_guix_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 5229eeda06..a46d4013d8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2361,7 +2361,8 @@ new Date();")) #t)) (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..4ebdadc671 --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-get_guix_jdk_version.patch @@ -0,0 +1,37 @@ +From d156313340d3edcd78751ea8ed5e66c7668275c3 Mon Sep 17 00:00:00 2001 +From: Alexey Abramov +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 +