From mboxrd@z Thu Jan  1 00:00:00 1970
From: levenson@mmer.org
Subject: Re: [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful
 patch.
Date: Tue, 03 Mar 2020 18:33:34 +0100
Message-ID: <84k1412vip.fsf@delta.i-did-not-set--mail-host-address--so-tickle-me>
References: <20200222201755.50425-1-levenson@mmer.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:38703)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <levenson@mmer.org>) id 1j9BQW-00013w-Ca
 for guix-devel@gnu.org; Tue, 03 Mar 2020 12:33:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <levenson@mmer.org>) id 1j9BQV-00007I-8b
 for guix-devel@gnu.org; Tue, 03 Mar 2020 12:33:52 -0500
Received: from mx4.mail.mmer.org ([178.22.66.29]:60314)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <levenson@mmer.org>) id 1j9BQV-00006F-1u
 for guix-devel@gnu.org; Tue, 03 Mar 2020 12:33:51 -0500
In-Reply-To: <20200222201755.50425-1-levenson@mmer.org> (Alexey Abramov's
 message of "Sat, 22 Feb 2020 21:17:49 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: guix-devel@gnu.org
Cc: 39742@debbugs.gnu.org

Hi

I packaged openjfx and would like to get some review. Can someone take a look?

Alexey Abramov <levenson@mmer.org> writes:

> * 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])

-- 
Alexey