From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wIPhEcRBwV6LCgAA0tVLHw (envelope-from ) for ; Sun, 17 May 2020 13:53:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mLGtDcRBwV4DdwAA1q6Kng (envelope-from ) for ; Sun, 17 May 2020 13:53:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C6D84940143 for ; Sun, 17 May 2020 13:53:07 +0000 (UTC) Received: from localhost ([::1]:34314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaJj0-0002Il-PQ for larch@yhetil.org; Sun, 17 May 2020 09:53:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaJiw-0002GJ-FI for guix-patches@gnu.org; Sun, 17 May 2020 09:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaJiw-00027j-5c for guix-patches@gnu.org; Sun, 17 May 2020 09:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaJiw-0008Ky-4f for guix-patches@gnu.org; Sun, 17 May 2020 09:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH 01/12] gnu: java-openjfx-build: Add helpful patch. References: <20200517132829.1553311-1-levenson@mmer.org> In-Reply-To: <20200517132829.1553311-1-levenson@mmer.org> Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 13:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41360 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41360@debbugs.gnu.org Received: via spool by 41360-submit@debbugs.gnu.org id=B41360.158972353631880 (code B ref 41360); Sun, 17 May 2020 13:53:02 +0000 Received: (at 41360) by debbugs.gnu.org; 17 May 2020 13:52:16 +0000 Received: from localhost ([127.0.0.1]:42664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaJi7-0008I2-Oh for submit@debbugs.gnu.org; Sun, 17 May 2020 09:52:16 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:53062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaJi1-0008Hk-UU for 41360@debbugs.gnu.org; Sun, 17 May 2020 09:52:10 -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 70C089CC2E for <41360@debbugs.gnu.org>; Sun, 17 May 2020 13:21:17 +0000 (UTC) From: Alexey Abramov Date: Sun, 17 May 2020 15:51:30 +0200 Message-Id: <20200517135138.1651512-1-levenson@mmer.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------[ mime-boundary-string ]" Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: x1sW1xl86Z3j This is a multi-part message in MIME format. --------------[ mime-boundary-string ] Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit * 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 --------------[ mime-boundary-string ] Content-Type: text/x-patch; name="0001-gnu-java-openjfx-build-Add-helpful-patch.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-gnu-java-openjfx-build-Add-helpful-patch.patch" diff --git a/gnu/local.mk b/gnu/local.mk index 118a9e24eb..ad0ad930ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1106,6 +1106,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 a4659240fc..7a1a2f0861 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-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 + --------------[ mime-boundary-string ]--