From patchwork Fri May 3 13:01:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13845 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 3980C16F8F; Fri, 3 May 2019 14:03:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 79B9016F8D for ; Fri, 3 May 2019 14:03:46 +0100 (BST) Received: from localhost ([127.0.0.1]:40484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXqr-00082v-RQ for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:03:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpD-0006Sn-L5 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpC-0000e6-Cv for guix-patches@gnu.org; Fri, 03 May 2019 09:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34521) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpC-0000e1-9G for guix-patches@gnu.org; Fri, 03 May 2019 09:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpC-0005so-4k for guix-patches@gnu.org; Fri, 03 May 2019 09:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 01/17] gnu: Add java-signpost-core. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850222420 (code B ref 35545); Fri, 03 May 2019 13:02:02 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:42 +0000 Received: from localhost ([127.0.0.1]:48022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXos-0005pT-HA for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:42 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXor-0005pL-5c for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:41 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id fcf37737 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:39 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:18 +0200 Message-Id: <20190503130134.24788-1-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503145820.606f37db@sybil.lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> 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/web.scm (java-signpost-core): New variable. --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7242ede3be..53763687b4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6207,6 +6207,36 @@ provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jQuery-like methods.") (license license:expat))) +(define-public java-signpost-core + (package + (name "java-signpost-core") + (version "1.2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mttkay/signpost") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l04yj2znch3hpyw90c4g4jan453w7d88l84bgl0c72i2kbb8z7h")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "signpost-core.jar" + #:source-dir "signpost-core/src/main/java" + #:test-dir "signpost-core/src/test" + ;; Tests all fail with InstantiationException from mockito + #:tests? #f)) + (propagated-inputs + `(("java-commons-codec" ,java-commons-codec))) + (home-page "https://github.com/mttkay/signpost") + (synopsis "Lightweight client-side OAuth library for Java") + (description "Signpost is the easy and intuitive solution for signing +HTTP messages on the Java platform in conformance with the OAuth Core 1.0a +standard. Signpost follows a modular and flexible design, allowing you to +combine it with different HTTP messaging layers.") + (license license:asl2.0))) + (define-public tidyp (package (name "tidyp") From patchwork Fri May 3 13:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13849 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 B608816F8F; Fri, 3 May 2019 14:04:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 148CD16F8D for ; Fri, 3 May 2019 14:04:20 +0100 (BST) Received: from localhost ([127.0.0.1]:40506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXrP-0008UK-LJ for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:04:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpH-0006Yg-V3 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpC-0000ec-Vc for guix-patches@gnu.org; Fri, 03 May 2019 09:02:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpC-0000eX-Ry for guix-patches@gnu.org; Fri, 03 May 2019 09:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpC-0005sv-N1 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 02/17] gnu: Add java-jsonp-api. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850422441 (code B ref 35545); Fri, 03 May 2019 13:02:02 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:44 +0000 Received: from localhost ([127.0.0.1]:48026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXot-0005pm-PH for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:43 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXos-0005pL-0O for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:42 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 1d732077 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:19 +0200 Message-Id: <20190503130134.24788-2-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-jsonp-api): New variable. --- gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9664d749fb..7fb619cc40 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11054,3 +11054,32 @@ network protocols, and core version control algorithms.") `(("java-javaewah" ,java-javaewah) ("java-jsch" ,java-jsch) ("java-slf4j-api" ,java-slf4j-api))))) + +(define-public java-jsonp-api + (package + (name "java-jsonp-api") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/jsonp") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nxq16lrx7i87hgyj5rzcwilvr67h0i299gygfn8f5vs4n7n59vy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jsonp-api.jar" + #:tests? #f + #:source-dir "api/src/main/java" + #:test-dir "api/src/test")) + (home-page "https://javaee.github.io/jsonp/") + (synopsis "JSON Processing in Java") + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. It produces and +consumes JSON text in a streaming fashion (similar to StAX API for XML) +and allows to build a Java object model for JSON text using API classes +(similar to DOM API for XML).") + (license (list license:gpl2 + license:epl2.0)))) From patchwork Fri May 3 13:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13853 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 F276516F8F; Fri, 3 May 2019 14:07:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AA14616F8D for ; Fri, 3 May 2019 14:07:54 +0100 (BST) Received: from localhost ([127.0.0.1]:40579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXus-0002oF-9i for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:07:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpE-0006U3-K5 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpD-0000f9-K1 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34523) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpD-0000f0-Fj for guix-patches@gnu.org; Fri, 03 May 2019 09:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpD-0005t3-AC for guix-patches@gnu.org; Fri, 03 May 2019 09:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 03/17] gnu: Add java-jsonp-impl. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850422447 (code B ref 35545); Fri, 03 May 2019 13:02:03 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:44 +0000 Received: from localhost ([127.0.0.1]:48028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXou-0005pu-1f for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:44 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXos-0005pL-PN for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:43 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id b55f6d4a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:20 +0200 Message-Id: <20190503130134.24788-3-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-jsonp-impl): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7fb619cc40..d0bbc4b682 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11083,3 +11083,18 @@ and allows to build a Java object model for JSON text using API classes (similar to DOM API for XML).") (license (list license:gpl2 license:epl2.0)))) + +(define-public java-jsonp-impl + (package + (inherit java-jsonp-api) + (name "java-jsonp-impl") + (arguments + `(#:jar-name "jsonp-impl.jar" + #:tests? #f + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test")) + (propagated-inputs + `(("java-jsonp-api" ,java-jsonp-api))) + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. This package contains +a reference implementation of that API."))) From patchwork Fri May 3 13:01:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13846 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 C348216F8F; Fri, 3 May 2019 14:03:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5E5EE16F8D for ; Fri, 3 May 2019 14:03:55 +0100 (BST) Received: from localhost ([127.0.0.1]:40490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXr0-0008BJ-Sl for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:03:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpF-0006Uw-AO for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpE-0000fP-6I for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpE-0000fL-2O for guix-patches@gnu.org; Fri, 03 May 2019 09:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpD-0005tA-TL for guix-patches@gnu.org; Fri, 03 May 2019 09:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 04/17] gnu: Add java-xmp. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850522466 (code B ref 35545); Fri, 03 May 2019 13:02:03 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:45 +0000 Received: from localhost ([127.0.0.1]:48032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXov-0005qI-Dn for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:45 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXot-0005pL-Ei for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:43 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id c8ac694f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:21 +0200 Message-Id: <20190503130134.24788-4-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-xmp): New variable. --- gnu/packages/java.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d0bbc4b682..ee54e936bc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11098,3 +11098,42 @@ and allows to build a Java object model for JSON text using API classes (description "JSON Processing (JSON-P) is a Java API to process (e.g. parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) + +(define-public java-xmp + (package + (name "java-xmp") + (version "5.1.3") + (source (origin + (method url-fetch) + (uri (string-append "http://download.macromedia.com/pub/developer" + "/xmp/sdk/XMPCoreJava-" version ".zip")) + (sha256 + (base32 + "14nai2mmsg7l5ya2y5mx4w4lr1az3sk2fjz6hiy4zdrsavgvl1g7")))) + (build-system ant-build-system) + (arguments + `(#:build-target "build" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "XMPCore") + #t)) + (replace 'install + (install-jars ".")) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "docs" + (string-append (assoc-ref outputs "out") "/share/doc/java-xmp")) + #t))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.adobe.com/devnet/xmp.html") + (synopsis "Extensible Metadat Platform (XMP) support in Java") + (description "Adobe's Extensible Metadata Platform (XMP) is a labeling +technology that allows you to embed data about a file, known as metadata, +into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore +library and the API is similar.") + (license license:bsd-3))) From patchwork Fri May 3 13:01:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13848 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 A0C6016F8F; Fri, 3 May 2019 14:04:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1FE6D16F8D for ; Fri, 3 May 2019 14:04:11 +0100 (BST) Received: from localhost ([127.0.0.1]:40496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXrG-0008Kx-IC for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:04:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpF-0006VY-Vo for guix-patches@gnu.org; Fri, 03 May 2019 09:02:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpE-0000fm-Mn for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpE-0000fa-J6 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpE-0005tI-Ej for guix-patches@gnu.org; Fri, 03 May 2019 09:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 05/17] gnu: Add java-metadata-extractor. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850822507 (code B ref 35545); Fri, 03 May 2019 13:02:04 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:48 +0000 Received: from localhost ([127.0.0.1]:48040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXox-0005ql-MZ for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:48 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXou-0005pL-4m for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:44 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 824154af (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:22 +0200 Message-Id: <20190503130134.24788-5-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-metadata-extractor): New variable. --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ee54e936bc..c17b8572ec 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11137,3 +11137,40 @@ technology that allows you to embed data about a file, known as metadata, into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore library and the API is similar.") (license license:bsd-3))) + +(define-public java-metadata-extractor + (package + (name "java-metadata-extractor") + (version "2.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drewnoakes/metadata-extractor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yrq0swrl1r40yjbk5kqzjxr04jlkq9lfi711jvfgjf5kp2qinj")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "metadata-extractor.jar" + #:source-dir "Source" + #:test-dir "Tests" + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-dir + (lambda _ + (substitute* "build.xml" + (("/java\">") "\">")) + #t))))) + (propagated-inputs + `(("java-xmp" ,java-xmp))) + (native-inputs + `(("java-hamcrest-core" ,java-hamcrest-core) + ("java-junit" ,java-junit))) + (home-page "https://github.com/drewnoakes/metadata-extractor") + (synopsis "Extract metadata from image and video files") + (description "Metadata-extractor is a straightforward Java library for +reading metadata from image files. It is able to read metadata in Exif, +IPTC, XMP, ICC and more formats.") + (license license:asl2.0))) From patchwork Fri May 3 13:01:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13854 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 6D78C16F8F; Fri, 3 May 2019 14:07:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0F2CE16F8D for ; Fri, 3 May 2019 14:07:59 +0100 (BST) Received: from localhost ([127.0.0.1]:40581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXuw-0002qk-LU for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:07:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpG-0006Vz-83 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpF-0000gu-8o for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34526) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpF-0000gq-5j for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpF-0005tP-20 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 06/17] gnu: javacc: Install binaries. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850822514 (code B ref 35545); Fri, 03 May 2019 13:02:05 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:48 +0000 Received: from localhost ([127.0.0.1]:48042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005qz-5B for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:48 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXou-0005pL-Rf for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:45 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 7163efa3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:23 +0200 Message-Id: <20190503130134.24788-6-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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 (javacc)[arguments]: Add install-bin phase. --- gnu/packages/java.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c17b8572ec..b203856e2f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2290,7 +2290,25 @@ debugging, etc.") #:test-target "test" #:phases (modify-phases %standard-phases - (replace 'install (install-jars "target"))))) + (replace 'install (install-jars "target")) + (add-after 'install 'install-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/java")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (with-output-to-file (string-append bin "/javacc") + (lambda _ + (display + (string-append "#!/bin/sh\n" + (assoc-ref inputs "jdk") "/bin/java" + " -cp " dir "/javacc.jar" " `basename $0`" " $*")))) + (chmod (string-append bin "/javacc") #o755) + (symlink (string-append bin "/javacc") + (string-append bin "/jjdoc")) + (symlink (string-append bin "/javacc") + (string-append bin "/jjtree")))))))) + (native-inputs `(("javacc" ,javacc-4))))) From patchwork Fri May 3 13:01:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13847 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 B05B916F8F; Fri, 3 May 2019 14:03:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2F51616F8D for ; Fri, 3 May 2019 14:03:56 +0100 (BST) Received: from localhost ([127.0.0.1]:40492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXr1-0008CG-Ng for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:03:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpH-0006Ws-1O for guix-patches@gnu.org; Fri, 03 May 2019 09:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpF-0000hg-R2 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpF-0000hD-Ne for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpF-0005tX-Jx for guix-patches@gnu.org; Fri, 03 May 2019 09:02:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 07/17] gnu: Add java-openjfx-build. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850922533 (code B ref 35545); Fri, 03 May 2019 13:02:05 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:49 +0000 Received: from localhost ([127.0.0.1]:48045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005r6-E8 for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:48 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXov-0005pL-Fl for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:46 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 3edbbe60 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:40 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:24 +0200 Message-Id: <20190503130134.24788-7-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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): New variable. --- gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b203856e2f..65d2baef21 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2216,6 +2216,47 @@ new Date();")) `(("java-junit" ,java-junit) ,@(package-inputs ant/java8))))) +(define-public java-openjfx-build + (package + (name "java-openjfx-build") + ;; This is a java-8 version + (version "8.202") + (source (origin + (method url-fetch) + (uri (string-append "http://hg.openjdk.java.net/openjfx/8u-dev/rt" + "/archive/85d09981ae0d.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "038yg2c9swmckw5ch8cvzxf5hw0fdvxa3wljnw5yhbhqgvawpz3a")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-openjfx.jar" + #:source-dir "buildSrc/src/main/java" + #:test-dir "buildSrc/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-jsl-parser + (lambda _ + (invoke "antlr3" "-o" + "buildSrc/src/main/java/com/sun/scenario/effect/compiler" + "buildSrc/src/main/antlr/JSL.g")))))) + (inputs + `(("antlr3" ,antlr3) + ("java-stringtemplate" ,java-stringtemplate))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "https://openjfx.io") + (synopsis "Graphical application toolkit in Java") + (description "OpenJFX is a free, next generation client application +platform for desktop, mobile and embedded systems built on Java. Its goal +is to produce a modern, efficient, and fully featured toolkit for developing +rich client applications. This package contains base classes for the +OpenJFX distribution and helper classes for building other parts of the +distribution.") + (license license:gpl2)));with classpath exception + (define-public javacc-4 (package (name "javacc") From patchwork Fri May 3 13:01:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13855 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 382C316F8F; Fri, 3 May 2019 14:08:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C1D1116F8D for ; Fri, 3 May 2019 14:08:03 +0100 (BST) Received: from localhost ([127.0.0.1]:40583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXv1-0002t7-Ci for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpH-0006Xg-Cu for guix-patches@gnu.org; Fri, 03 May 2019 09:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpG-0000i5-Dr for guix-patches@gnu.org; Fri, 03 May 2019 09:02:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpG-0000i0-AA for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpG-0005te-5E for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 08/17] gnu: Add java-openjfx-base. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688850922540 (code B ref 35545); Fri, 03 May 2019 13:02:06 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:49 +0000 Received: from localhost ([127.0.0.1]:48048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005rO-T4 for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:49 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXov-0005qH-R1 for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:46 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 586bd0e4 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:25 +0200 Message-Id: <20190503130134.24788-8-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-base): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 65d2baef21..9d2019ddc5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2257,6 +2257,37 @@ OpenJFX distribution and helper classes for building other parts of the distribution.") (license license:gpl2)));with classpath exception +(define-public java-openjfx-base + (package (inherit java-openjfx-build) + (name "java-openjfx-base") + (arguments + `(#:jar-name "java-openjfx-base.jar" + #:source-dir "modules/base/src/main/java:modules/base/src/main/java8:modules/base/src/main/version-info" + #:test-dir "modules/base/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-empty-file + (lambda _ + (with-directory-excursion "modules/base/src/test/java" + ;; These files are completely commented, but junit expects them to + ;; contain a class, so tests fail. + (delete-file + "com/sun/javafx/property/adapter/PropertyDescriptorTest.java") + (delete-file + "com/sun/javafx/property/adapter/ReadOnlyPropertyDescriptorTest.java") + (delete-file "javafx/beans/property/PropertiesTest.java") + (delete-file + "javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyBuilder_General_Test.java") + ;; This one fails + (delete-file "com/sun/javafx/runtime/VersionInfoTest.java"))))))) + (propagated-inputs + `(("java-openjfx-build" ,java-openjfx-build))) + (description "OpenJFX is a free, next generation client application +platform for desktop, mobile and embedded systems built on Java. Its goal +is to produce a modern, efficient, and fully featured toolkit for developing +rich client applications. This package contains base classes for the +OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") From patchwork Fri May 3 13:01:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13856 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 4F72316F8F; Fri, 3 May 2019 14:08:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 049BB16F8D for ; Fri, 3 May 2019 14:08:11 +0100 (BST) Received: from localhost ([127.0.0.1]:40585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXv8-0002vZ-KE for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpH-0006Ye-UE for guix-patches@gnu.org; Fri, 03 May 2019 09:02:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpG-0000iT-R6 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpG-0000iM-O7 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpG-0005tm-LJ for guix-patches@gnu.org; Fri, 03 May 2019 09:02:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 09/17] gnu: Add java-openjfx-graphics. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851022554 (code B ref 35545); Fri, 03 May 2019 13:02:06 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:50 +0000 Received: from localhost ([127.0.0.1]:48051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoz-0005rV-9o for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:49 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXow-0005pL-Dg for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:46 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id e0c49179 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:26 +0200 Message-Id: <20190503130134.24788-9-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-graphics): New variable. --- gnu/packages/java.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9d2019ddc5..2f9b0374f8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2288,6 +2288,23 @@ is to produce a modern, efficient, and fully featured toolkit for developing rich client applications. This package contains base classes for the OpenJFX distribution."))) +(define-public java-openjfx-graphics + (package (inherit java-openjfx-build) + (name "java-openjfx-graphics") + (arguments + `(#:jar-name "java-openjfx-graphics.jar" + #:source-dir "modules/graphics/src/main/java" + #:tests? #f; require X + #:test-dir "modules/graphics/src/test")) + (propagated-inputs + `(("java-openjfx-base" ,java-openjfx-base) + ("java-swt" ,java-swt))) + (description "OpenJFX is a free, next generation client application +platform for desktop, mobile and embedded systems built on Java. Its goal +is to produce a modern, efficient, and fully featured toolkit for developing +rich client applications. This package contains graphics-related classes for +the OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") From patchwork Fri May 3 13:01:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13860 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 ACB9A16F8F; Fri, 3 May 2019 14:08:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 09E5E16F8D for ; Fri, 3 May 2019 14:08:31 +0100 (BST) Received: from localhost ([127.0.0.1]:40593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvS-00037D-L6 for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpO-0006hL-9W for guix-patches@gnu.org; Fri, 03 May 2019 09:02:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpJ-0000k5-Dv for guix-patches@gnu.org; Fri, 03 May 2019 09:02:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34530) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpJ-0000jt-9k for guix-patches@gnu.org; Fri, 03 May 2019 09:02:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpH-0005tt-3i for guix-patches@gnu.org; Fri, 03 May 2019 09:02:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 10/17] gnu: Add java-openjfx-media. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851022561 (code B ref 35545); Fri, 03 May 2019 13:02:07 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:50 +0000 Received: from localhost ([127.0.0.1]:48054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoz-0005rf-Nd for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:50 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXow-0005qH-Hq for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:46 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id d1c2c142 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:27 +0200 Message-Id: <20190503130134.24788-10-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-media): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2f9b0374f8..b9ac4459b0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2305,6 +2305,21 @@ is to produce a modern, efficient, and fully featured toolkit for developing rich client applications. This package contains graphics-related classes for the OpenJFX distribution."))) +(define-public java-openjfx-media + (package (inherit java-openjfx-build) + (name "java-openjfx-media") + (propagated-inputs + `(("java-openjxf-graphics" ,java-openjfx-graphics))) + (arguments + `(#:jar-name "java-openjfx-media.jar" + #:source-dir "modules/media/src/main/java" + #:tests? #f)); no tests + (description "OpenJFX is a free, next generation client application +platform for desktop, mobile and embedded systems built on Java. Its goal +is to produce a modern, efficient, and fully featured toolkit for developing +rich client applications. This package contains media-related classes for +the OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") From patchwork Fri May 3 13:01:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13852 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 ED9D516F8F; Fri, 3 May 2019 14:06:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C8BE216F8D for ; Fri, 3 May 2019 14:06:33 +0100 (BST) Received: from localhost ([127.0.0.1]:40560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXtZ-00023G-DF for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:06:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpK-0006cj-Vr for guix-patches@gnu.org; Fri, 03 May 2019 09:02:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpJ-0000kY-Qv for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpJ-0000kF-Ni for guix-patches@gnu.org; Fri, 03 May 2019 09:02:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpJ-0005u5-Ka for guix-patches@gnu.org; Fri, 03 May 2019 09:02:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 11/17] gnu: Add java-jmapviewer. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851022568 (code B ref 35545); Fri, 03 May 2019 13:02:09 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:50 +0000 Received: from localhost ([127.0.0.1]:48057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp0-0005rq-5Q for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:50 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXox-0005pL-4H for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:47 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 48491539 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:28 +0200 Message-Id: <20190503130134.24788-11-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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/geo.scm (java-jmapviewer): New variable. --- gnu/packages/geo.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0b95fbe613..de9e228a25 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -24,6 +24,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages geo) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -851,3 +852,38 @@ map, geocoding with Nominatim, or general analysis.") the texture and density of features is visible at every zoom level, instead of dropping features at lower levels.") (license license:bsd-2))) + +(define-public java-jmapviewer + (package + (name "java-jmapviewer") + (version "2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://svn.openstreetmap.org/applications/" + "viewer/jmapviewer/releases/" version + "/JMapViewer-" version "-Source.zip")) + (sha256 + (base32 + "06jilhvsx662raix58g8ccl56d1pmirwlys9px0mdg7j46wixk6l")))) + (build-system ant-build-system) + (native-inputs + `(("unzip" ,unzip))) + (arguments + `(#:build-target "pack" + #:tests? #f; No tests + #:phases + (modify-phases %standard-phases + (add-before 'build 'clean + (lambda* _ + (invoke "ant" "clean"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") "/share/java/"))) + (mkdir-p dir) + (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) + (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") + (synopsis "OSM map integration in Java") + (description "JMapViewer is a Java component which allows to easily +integrate an OSM map view into your Java application. It is maintained as +an independent project by the JOSM team.") + (license license:gpl2))) From patchwork Fri May 3 13:01:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13858 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 37CFA16F8F; Fri, 3 May 2019 14:08:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 33F9B16F8D for ; Fri, 3 May 2019 14:08:20 +0100 (BST) Received: from localhost ([127.0.0.1]:40589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvH-00032J-Pn for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpL-0006eG-Uh for guix-patches@gnu.org; Fri, 03 May 2019 09:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpK-0000l5-AU for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpK-0000kw-6r for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpK-0005uD-38 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851322579 (code B ref 35545); Fri, 03 May 2019 13:02:10 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:53 +0000 Received: from localhost ([127.0.0.1]:48059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp2-0005s5-KI for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:53 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXox-0005qH-8W for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:47 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id e24d8cc3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:29 +0200 Message-Id: <20190503130134.24788-12-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-svg-salamander): New variable. * gnu/packages/patches/java-svg-salamander-Fix-non-det.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 47 ++++++++++ .../java-svg-salamander-Fix-non-det.patch | 86 +++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 gnu/packages/patches/java-svg-salamander-Fix-non-det.patch diff --git a/gnu/local.mk b/gnu/local.mk index a0f40d13ae..556f4a03f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -932,6 +932,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-jeromq-fix-tests.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 \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b9ac4459b0..ede24d130c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11296,3 +11296,50 @@ library and the API is similar.") reading metadata from image files. It is able to read metadata in Exif, IPTC, XMP, ICC and more formats.") (license license:asl2.0))) + +(define-public java-svg-salamander + (package + (name "java-svg-salamander") + (version "1.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blackears/svgSalamander") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf")) + (modules '((guix build utils))) + (snippet + `(for-each delete-file (find-files "." ".*.jar"))) + (patches + (search-patches "java-svg-salamander-Fix-non-det.patch")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "svg-core") + #t)) + (add-before 'build 'copy-jars + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (car (find-files (assoc-ref inputs "javacc") "\\.jar$")) + "../libraries/javacc.jar") + (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$")) + "../libraries/ant.jar") + #t)) + (replace 'install + (install-jars "dist"))))) + (native-inputs + `(("javacc" ,javacc))) + (home-page "https://github.com/blackears/svgSalamander") + (synopsis "SVG engine for Java") + (description "SVG Salamander is an SVG engine for Java that's designed +to be small, fast, and allow programmers to use it with a minimum of fuss. +It's in particular targeted for making it easy to integrate SVG into Java +games and making it much easier for artists to design 2D game content - from +rich interactive menus to charts and graphcs to complex animations.") + (license license:bsd-2))) diff --git a/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch new file mode 100644 index 0000000000..418fa0867f --- /dev/null +++ b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch @@ -0,0 +1,86 @@ +From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Thu, 2 May 2019 19:05:33 +0200 +Subject: [PATCH] Fix non determinism and installation + +--- + svg-core/build.xml | 22 ---------------------- + svg-core/nbproject/build-impl.xml | 1 - + 2 files changed, 23 deletions(-) + +diff --git a/svg-core/build.xml b/svg-core/build.xml +index cc72eb7..0f9c3e6 100755 +--- a/svg-core/build.xml ++++ b/svg-core/build.xml +@@ -102,7 +102,6 @@ + + + +- + + + +@@ -112,7 +111,6 @@ + + + +- + + + +@@ -126,7 +124,6 @@ + + + +- + + + +@@ -203,7 +200,6 @@ + + + +- + + + +@@ -213,24 +209,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml +index b448d8a..37725ad 100755 +--- a/svg-core/nbproject/build-impl.xml ++++ b/svg-core/nbproject/build-impl.xml +@@ -1045,7 +1045,6 @@ is divided into following sections: + + + +- + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" +-- +2.21.0 + From patchwork Fri May 3 13:01:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13857 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 E6B3516F8F; Fri, 3 May 2019 14:08:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8DD0A16F8D for ; Fri, 3 May 2019 14:08:15 +0100 (BST) Received: from localhost ([127.0.0.1]:40587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvD-0002xv-5d for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpL-0006eH-V1 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpK-0000lW-S3 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34533) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpK-0000lO-Oq for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpK-0005uK-L2 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 13/17] gnu: Add java-jboss-transaction-api-spec. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851322586 (code B ref 35545); Fri, 03 May 2019 13:02:10 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:53 +0000 Received: from localhost ([127.0.0.1]:48061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp3-0005s8-2j for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:53 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005pL-3w for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:48 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id d22d3c36 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:30 +0200 Message-Id: <20190503130134.24788-13-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-jboss-transaction-api-spec): New variable. --- gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ede24d130c..3528d3449e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11343,3 +11343,32 @@ It's in particular targeted for making it easy to integrate SVG into Java games and making it much easier for artists to design 2D game content - from rich interactive menus to charts and graphcs to complex animations.") (license license:bsd-2))) + +(define-public java-jboss-transaction-api-spec + (package + (name "java-jboss-transaction-api-spec") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jboss/jboss-transaction-api_spec") + (commit "c20742e0a8f1e0447d72d42be981050f3857b3f1"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xbfq5hvb86izflydxrqqv3k26c1ba2m0ap6m97shqrsdi9by4wy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-jboss-transaction-api_spec.jar" + #:source-dir "src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec))) + (home-page "https://github.com/jboss/jboss-transaction-api_spec") + (synopsis "Generic transaction management API in Java") + (description "Java-jboss-transaction-api-spec implements the Transactions +API. A transaction is a unit of work containing one or more operations +involving one or more shared resources having ACID (Atomicity, Consistency, +Isolation and Durability) properties.") + (license (list license:gpl2 license:cddl1.0)))); either gpl2 only or cddl. From patchwork Fri May 3 13:01:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13850 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 6F28916F8F; Fri, 3 May 2019 14:04:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1F22B16F8D for ; Fri, 3 May 2019 14:04:28 +0100 (BST) Received: from localhost ([127.0.0.1]:40508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXrX-00009w-MR for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:04:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpM-0006f4-Fz for guix-patches@gnu.org; Fri, 03 May 2019 09:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpL-0000lt-DN for guix-patches@gnu.org; Fri, 03 May 2019 09:02:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpL-0000lm-A1 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpL-0005uS-4q for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 14/17] gnu: Add java-commons-pool2. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851322593 (code B ref 35545); Fri, 03 May 2019 13:02:11 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:53 +0000 Received: from localhost ([127.0.0.1]:48063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp3-0005sF-E5 for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:53 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005qH-98 for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:48 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 29204238 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:42 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:31 +0200 Message-Id: <20190503130134.24788-14-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-commons-pool2): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3528d3449e..23e547bed4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4999,6 +4999,38 @@ expressions to graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.") (license license:asl2.0))) +(define-public java-commons-pool2 + (package + (name "java-commons-pool2") + (version "2.6.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/pool/source/" + "commons-pool2-" version "-src.tar.gz")) + (sha256 + (base32 + "1fi1hgqmq01bs6azbj3sfswxzadp2r8sjjfiq6ryilz1m50kvrv6")))) + (arguments + `(#:jar-name "common-pool.jar" + #:source-dir "src/main/java" + #:test-exclude + (list "**/PerformanceTest.java"))) + (build-system ant-build-system) + (inputs + `(("java-cglib" ,java-cglib))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-asm" ,java-asm) + ("java-objenesis" ,java-objenesis))) + (home-page "https://commons.apache.org/proper/commons-pool/") + (synopsis "Object-pooling API in Java") + (description "The commons-pool package provides an object-pooling API +and a number of object pool implementations. This package defines a +handful of pooling interfaces and some base classes that may be useful when +creating new pool implementations.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") From patchwork Fri May 3 13:01:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13851 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 4739516F8F; Fri, 3 May 2019 14:06:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6559016F8D for ; Fri, 3 May 2019 14:06:15 +0100 (BST) Received: from localhost ([127.0.0.1]:40550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXtG-0001fX-TP for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:06:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXtE-0001do-8s for guix-patches@gnu.org; Fri, 03 May 2019 09:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXt8-0006tM-0F for guix-patches@gnu.org; Fri, 03 May 2019 09:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXt5-0006lj-H1 for guix-patches@gnu.org; Fri, 03 May 2019 09:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXt5-00060Z-AF for guix-patches@gnu.org; Fri, 03 May 2019 09:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 15/17] gnu: Add java-commons-dbcp2. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688875323071 (code B ref 35545); Fri, 03 May 2019 13:06:03 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:05:53 +0000 Received: from localhost ([127.0.0.1]:48084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXsu-0005zy-Of for submit@debbugs.gnu.org; Fri, 03 May 2019 09:05:53 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoy-0005pL-Pg for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:49 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 63ce0a9d (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:42 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:32 +0200 Message-Id: <20190503130134.24788-15-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-commons-dbcp2): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 23e547bed4..8f8809c467 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5031,6 +5031,37 @@ handful of pooling interfaces and some base classes that may be useful when creating new pool implementations.") (license license:asl2.0))) +(define-public java-commons-dbcp2 + (package + (name "java-commons-dbcp2") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/dbcp/source/" + "commons-dbcp2-" version "-src.tar.gz")) + (sha256 + (base32 + "0axbvcbnf2l70fc3ybrlp3siw2w4ka9mia2pnx4py8gz54cpw3rc")))) + (arguments + `(#:source-dir "src/main/java" + #:jar-name "java-commons-dbcp.jar" + #:tests? #f)); requires apache-geronimo + (inputs + `(("java-commons-pool2" ,java-commons-pool2) + ("java-commons-logging" ,java-commons-logging-minimal) + ("java-jboss-transaction-api-spec" ,java-jboss-transaction-api-spec))) + (native-inputs + `(("java-junit" ,java-junit))) + (build-system ant-build-system) + (home-page "https://commons.apache.org/proper/commons-dbcp/") + (synopsis "Database Connection Pool for Java") + (description "Commons-dbcp allows you to share a pool of database +connections between users. Creating a new connection for each user can be +time consuming and even unfeasible when the number of simultaneous users is +very large. This package provides a way to share a poole of connections to +reduce that load.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") From patchwork Fri May 3 13:01:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13859 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 541D316F8F; Fri, 3 May 2019 14:08:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 027B716F8D for ; Fri, 3 May 2019 14:08:25 +0100 (BST) Received: from localhost ([127.0.0.1]:40591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvM-00034m-JX for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpN-0006gK-HX for guix-patches@gnu.org; Fri, 03 May 2019 09:02:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpM-0000mV-9j for guix-patches@gnu.org; Fri, 03 May 2019 09:02:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpM-0000mM-5L for guix-patches@gnu.org; Fri, 03 May 2019 09:02:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpL-0005uZ-Pq for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 16/17] gnu: Add java-commons-jcs. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851422600 (code B ref 35545); Fri, 03 May 2019 13:02:11 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:54 +0000 Received: from localhost ([127.0.0.1]:48065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp3-0005sM-Oi for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:54 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoz-0005qH-2U for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:49 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 2750d996 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:42 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:33 +0200 Message-Id: <20190503130134.24788-16-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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-commons-jcs): New variable. --- gnu/packages/java.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8f8809c467..1ddcd4a814 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5062,6 +5062,52 @@ very large. This package provides a way to share a poole of connections to reduce that load.") (license license:asl2.0))) +(define-public java-commons-jcs + (package + (name "java-commons-jcs") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/jcs/source/" + "commons-jcs-dist-" version "-src.tar.gz")) + (sha256 + (base32 + "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "commons-jcs.jar" + #:source-dir "commons-jcs-core/src/main/java" + #:test-dir "commons-jcs-core/src/test" + #:tests? #f; requires hsqldb + #:phases + (modify-phases %standard-phases + (add-before 'build 'prepare + (lambda _ + (with-directory-excursion + "commons-jcs-core/src/main/java/org/apache/commons/jcs" + (substitute* + "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" + (("commons.dbcp") "commons.dbcp2") + ((".*\\.setMaxActive.*") "")) + ;;; Remove dependency on velocity-tools + (delete-file "admin/servlet/JCSAdminServlet.java")) + #t))))) + (propagated-inputs + `(("java-classpathx-servletapi" ,java-classpathx-servletapi) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-httpclient" ,java-commons-httpclient) + ("java-commons-dbcp" ,java-commons-dbcp2))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://commons.apache.org/proper/commons-jcs/") + (synopsis "Distributed caching system in Java") + (description "JCS is a distributed caching system written in Java. It +is intended to speed up applications by providing a means to manage cached +data of various dynamic natures. Like any caching system, JCS is most useful +for high read, low put applications. Latency times drop sharply and +bottlenecks move away from the database in an effectively cached system.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") From patchwork Fri May 3 13:01:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13861 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 851B216F8F; Fri, 3 May 2019 14:08:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D290916F8D for ; Fri, 3 May 2019 14:08:35 +0100 (BST) Received: from localhost ([127.0.0.1]:40595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvX-00039a-E2 for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXtE-0001dn-8t for guix-patches@gnu.org; Fri, 03 May 2019 09:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXt8-0006tG-10 for guix-patches@gnu.org; Fri, 03 May 2019 09:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXt5-0006kd-7i for guix-patches@gnu.org; Fri, 03 May 2019 09:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXt3-00060R-QM for guix-patches@gnu.org; Fri, 03 May 2019 09:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 17/17] gnu: Add josm. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688875223065 (code B ref 35545); Fri, 03 May 2019 13:06:01 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:05:52 +0000 Received: from localhost ([127.0.0.1]:48082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXsu-0005zw-C4 for submit@debbugs.gnu.org; Fri, 03 May 2019 09:05:52 -0400 Received: from lepiller.eu ([89.234.186.109]:60756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXoz-0005pL-J4 for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:50 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 67d63eb4 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:42 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:34 +0200 Message-Id: <20190503130134.24788-17-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> 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/geo.scm (josm): New variable. --- gnu/packages/geo.scm | 134 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index de9e228a25..06fd6c2822 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages icu4c) + #:use-module (gnu packages java) #:use-module (gnu packages lua) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -887,3 +888,136 @@ dropping features at lower levels.") integrate an OSM map view into your Java application. It is maintained as an independent project by the JOSM team.") (license license:gpl2))) + +(define-public josm + (package + (name "josm") + (version "15031") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openstreetmap/josm.git") + (commit "04d4c64b1b5698c0f9af40938f32194bc25bf75f"))) + (sha256 + (base32 + "0dgxa0yqh2sxl6nvpzw9507y5rdfxvmy54bhk2gfk1hxh3hvgmxh")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.jar")) + (for-each delete-file-recursively + '("src/org/apache" + "src/org/glassfish" + "src/org/tukaani" + "src/javax" + "src/oauth" + "src/com")) + #t)))) + (build-system ant-build-system) + (native-inputs + `(("javacc" ,javacc))) + (inputs + `(("java-commons-jcs" ,java-commons-jcs) + ("java-commons-compress" ,java-commons-compress) + ("java-jmapviewer" ,java-jmapviewer) + ("java-jsonp-api" ,java-jsonp-api) + ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency + ("java-metadata-extractor" ,java-metadata-extractor) + ("java-openjfx-media" ,java-openjfx-media) + ("java-signpost-core" ,java-signpost-core) + ("java-svg-salamander" ,java-svg-salamander))) + (arguments + `(#:tests? #f + #:jar-name "josm.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'rm-build.xml + (lambda* _ + (delete-file "build.xml") + #t)) + (add-before 'build 'fix-revision + (lambda* _ + (with-output-to-file "REVISION.XML" + (lambda _ + (display + (string-append "" + "1970-01-01 00:00:00 +0000" + "")))) + #t)) + (add-before 'build 'generate-parser + (lambda* _ + (let* ((dir "src/org/openstreetmap/josm/gui/mappaint/mapcss") + (out (string-append dir "/parsergen")) + (file (string-append dir "/MapCSSParser.jj"))) + (mkdir-p "src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen") + (invoke "javacc" "-DEBUG_PARSER=false" + "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" + "-GRAMMAR_ENCODING=UTF-8" + (string-append "-OUTPUT_DIRECTORY=" out) + file)) + #t)) + (add-after 'build 'generate-epsg + (lambda _ + (system* "javac" "scripts/BuildProjectionDefinitions.java" + "-cp" "build/classes") + (mkdir-p "data/projection") + (with-output-to-file "data/projection/custom-epsg" + (lambda _ (display ""))) + (invoke "java" "-cp" "build/classes:scripts:." + "BuildProjectionDefinitions" ".") + #t)) + (add-after 'generate-epsg 'copy-data + (lambda _ + (mkdir-p "build/classes") + (rename-file "data" "build/classes/data") + #t)) + (add-before 'install 'regenerate-jar + (lambda _ + ;; We need to regenerate the jar file to add data. + (delete-file "build/jar/josm.jar") + (invoke "jar" "-cf" "build/jar/josm.jar" "-C" + "build/classes" ".") + #t)) + (add-before 'build 'copy-styles + (lambda _ + (mkdir-p "build/classes") + (rename-file "styles" "build/classes/styles") + #t)) + (add-before 'build 'copy-images + (lambda _ + (mkdir-p "build/classes") + (rename-file "images" "build/classes/images") + #t)) + (add-before 'build 'copy-revision + (lambda _ + (mkdir-p "build/classes") + (with-output-to-file "build/classes/REVISION" + (lambda _ + (display + (string-append "Revision: " ,version "\n" + "Is-Local-Build: true\n" + "Build-Date: 1970-01-01 00:00:00 +0000\n")))) + #t)) + (add-after 'install 'install-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (with-output-to-file (string-append bin "/josm") + (lambda _ + (display + (string-append "#!/bin/sh\n" + (assoc-ref inputs "jdk") "/bin/java" + " -cp " out "/share/java/josm.jar:" + (getenv "CLASSPATH") + " org.openstreetmap.josm.gui.MainApplication")))) + (chmod (string-append bin "/josm") #o755)) + #t))))) + (home-page "https://josm.openstreetmap.de") + (synopsis "OSM editor") + (description "JOSM is an extensible editor for OpenStreetMap (OSM). It +supports loading GPX tracks, background imagery and OSM data from local +sources as well as from online sources and allows to edit the OSM data (nodes, +ways, and relations) and their metadata tags.") + (license license:gpl2+)))