From patchwork Sat Dec 11 02:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35118 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 C91C627BBEA; Sat, 11 Dec 2021 02:24:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B6E1227BBE9 for ; Sat, 11 Dec 2021 02:24:41 +0000 (GMT) Received: from localhost ([::1]:37790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs40-0001pF-RV for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0001oV-Df for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3O-0005D1-4n for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3O-0007MJ-0i for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 1/5] gnu: java-jansi: Update to 2.4.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940428206 (code B ref 52421); Sat, 11 Dec 2021 02:24:01 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:24 +0000 Received: from localhost ([127.0.0.1]:48263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2l-0007Kl-OA for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:24 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2i-0007KV-GH for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:22 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 45b83142 for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=S02mXm01VN7gck1upIFapvme3 OSn+ZwarJrQExUwa10=; b=OKboa2bZQAS1VSM/Gbnl/B/ACTgDplXPBYrwZrdGK KDU4JCGEn4Jyq8yjSCLYk6DIBFUt0rMEBvn6dLHntz9miDnAfODuQ6amhJ90MS/P QDh3BReTVLpQlZJ1YEYR2AC6zoNmNlnjcpPmgjzTIRisaOffJAJhLMWfiMM5g+3A +0Q7Rymqn1dqmxho1WD8kDw8Ny7UWCaLR9baEjm7Xn4oTAA+OkmVd794AjdnAx2E /iJMwVMYtPbi/8trmtDlp7PSuqTs8ZoN/6G0ZbxfLM21p4+Sp66yqhSx/HST09/M oTQU3wveuNcrgqgX7WsJW+Jnjc8y5qcOJ6ev/9b2SR0Kw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0bfe395c (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:18 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:03 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-jansi): Update to 2.4.0. (java-jansi-1): New variable. (java-jline-2)[inputs]: Use java-jansi-1. * gnu/packages/groovy.scm (java-groovy-bootstrap)[inputs]: Use java-jansi-1. --- gnu/packages/groovy.scm | 2 +- gnu/packages/java.scm | 82 +++++++++++++++++++++++++++++++++++------ 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index c44a17b59e..382dfe7faf 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm @@ -102,7 +102,7 @@ (define java-groovy-bootstrap ("java-asm-util" ,java-asm-util-8) ("java-classpathx-servletapi" ,java-classpathx-servletapi) ("java-commons-cli" ,java-commons-cli) - ("java-jansi" ,java-jansi) + ("java-jansi" ,java-jansi-1) ("java-jline-2" ,java-jline-2) ("java-picocli" ,java-picocli) ("java-xstream" ,java-xstream))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 36424ee8b1..51b8bc673d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -12134,15 +12134,78 @@ (define-public java-jansi-native (define-public java-jansi (package (name "java-jansi") + (version "2.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fusesource/jansi") + (commit (string-append "jansi-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s6fva06990798b5fyxqzr30zwyj1byq5wrm54j2larcydaryggf")) + (modules '((guix build utils))) + (snippet + ;; contains pre-compiled libraries + '(delete-file-recursively + "src/main/resources/org/fusesource/jansi/internal")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jansi.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:tests? #f; require junit 3 + #:phases + (modify-phases %standard-phases + (add-before 'build 'build-native + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "src/main/native" + (invoke "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o" + (string-append "-I" (assoc-ref inputs "jdk") + "/include/linux") + "-fPIC" "-O2") + (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o")))) + (add-before 'build 'install-native + (lambda _ + (let ((dir (string-append "build/classes/META-INF/org/fusesource/" + "jansi/internal/native/" + ,(match (%current-system) + ("i686-linux" "linux/x86") + ("x86_64-linux" "linux/x86_64") + ("armhf-linux" "linux/armv7") + ("aarch64-linux" "linux/arm64") + ("mips64el-linux" "linux/mips64") + (_ "unknown-kernel"))))) + (install-file "src/main/native/libjansi.so" dir)) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t)) + (add-after 'check 'clear-term + (lambda _ + (invoke "echo" "-e" "\\e[0m"))) + (replace 'install + (install-from-pom "pom.xml"))))) + (home-page "https://fusesource.github.io/jansi/") + (synopsis "Portable ANSI escape sequences") + (description "Jansi is a Java library that allows you to use ANSI escape +sequences to format your console output which works on every platform.") + (license license:asl2.0))) + +(define-public java-jansi-1 + (package + (inherit java-jansi) (version "1.16") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fusesource/jansi/archive/" - "jansi-project-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fusesource/jansi") + (commit (string-append "jansi-project-" version)))) + (file-name (git-file-name "jansi" version)) (sha256 (base32 - "11kh3144i3fzp21dpy8zg52mjmsr214k7km9p8ly0rqk2px0qq2z")))) - (build-system ant-build-system) + "0ikk0x352gh30b42qn1jd89xwsjj0mavrc5kms7fss15bd8vsayx")))) (arguments `(#:jar-name "jansi.jar" #:source-dir "jansi/src/main/java" @@ -12173,12 +12236,7 @@ (define-public java-jansi `(("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "https://fusesource.github.io/jansi/") - (synopsis "Portable ANSI escape sequences") - (description "Jansi is a Java library that allows you to use ANSI escape -sequences to format your console output which works on every platform.") - (license license:asl2.0))) + ("java-hamcrest-core" ,java-hamcrest-core))))) (define-public java-jboss-el-api-spec (package @@ -12541,7 +12599,7 @@ (define-public java-jline-2 `(#:jdk ,icedtea-8 ,@(package-arguments java-jline))) (inputs - `(("java-jansi" ,java-jansi) + `(("java-jansi" ,java-jansi-1) ("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-powermock-modules-junit4" ,java-powermock-modules-junit4)