From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:34350) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5bFs-0005lu-EX for guix-patches@gnu.org; Sat, 22 Feb 2020 15:20:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5bFr-0003Qp-GM for guix-patches@gnu.org; Sat, 22 Feb 2020 15:20:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5bFr-0003QN-CS for guix-patches@gnu.org; Sat, 22 Feb 2020 15:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5bFr-0001ot-8f for guix-patches@gnu.org; Sat, 22 Feb 2020 15:20:03 -0500 Subject: [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful patch. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:34170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5bEs-0005c9-4V for guix-patches@gnu.org; Sat, 22 Feb 2020 15:19:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5bEr-0008GW-25 for guix-patches@gnu.org; Sat, 22 Feb 2020 15:19:02 -0500 Received: from mx4.mail.mmer.org ([178.22.66.29]:28682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j5bEq-0007ti-RZ for guix-patches@gnu.org; Sat, 22 Feb 2020 15:19:01 -0500 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 093DC9CC71 for ; Sat, 22 Feb 2020 19:48:11 +0000 (UTC) From: Alexey Abramov Date: Sat, 22 Feb 2020 21:17:49 +0100 Message-Id: <20200222201755.50425-1-levenson@mmer.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39742@debbugs.gnu.org * 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.pat= ch 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() !=3D null) { + String v =3D inStream.readLine(); + if (v !=3D null) { +- int ib =3D v.indexOf(" (build "); ++ int ib =3D v.indexOf(" (guix build "); + if (ib !=3D -1) { +- String ver =3D v.substring(ib + 8, v.size() - 1); ++ String ver =3D v.substring(ib + 13, v.size() - 1); +=20 + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-= ")[0]) --=20 2.24.1