From patchwork Thu Nov 2 06:50:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55816 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 E0FE327BBE9; Thu, 2 Nov 2023 06:52:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 127EF27BBE2 for ; Thu, 2 Nov 2023 06:52:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYC-0005B0-I8; Thu, 02 Nov 2023 02:51:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyRYA-0005AP-GZ for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyRYA-0001P9-89 for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYi-0004s6-5Y; Thu, 02 Nov 2023 02:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 5/5] gnu: josm: Update to 18822. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890789718650 (code B ref 66879); Thu, 02 Nov 2023 06:52:04 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:37 +0000 Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRYD-0004qa-DT for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:37 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:44222 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXw-0004pD-2y for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:22 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id af636de8 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=P8cvRSeKGn839Hs7EUqLusdWF KESq7eEFOcAH72V+KM=; b=XQoWR7KQfHzHaxH30++7/UWC1LedRn+hx3mCQkgbV lhU9ZNxMAP/84o/tFTkN8AkhWgajMUrFWQBXxBCczTp+j4aRXzkhAbUENpFtBZSo 6Y+fF7JPFDSYfTTrZlpEUUt5kEVFhh7lDxm1/DiOSZx+lt2viCNhMlMF3zvntiJ8 QxcharEKqHHBLll50XjcbYw3qmQyL+3xka7PsAFl9cSGJG00hweFUou/36TE0mBA DNhsDe1D4UVqsGmxZ0t2RyrEJNUq8OZiaxnCcC89obEysbY9r5Rw3SK6PIYslAPM d2gpBvGw338WdwI6aUes4K6tAk8iMdqSG3EEik6jP/6MQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 61a240bc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a33d446201..dbc8440141 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1940,7 +1940,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18646") + (version "18822") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) + "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,17 +1963,18 @@ (define-public josm (list java-commons-jcs java-commons-compress java-jmapviewer - java-jsonp-api - java-jsonp-impl ; runtime dependency + java-jakarta-json java-jsr305 java-metadata-extractor java-opening-hours-parser java-openjfx-media + java-parsson ; runtime dependency java-signpost-core java-svg-salamander)) (arguments `(#:tests? #f #:jar-name "josm.jar" + #:jdk ,openjdk11 #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-build.xml