From patchwork Wed Nov 1 12:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55793 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 207AF27BBEA; Wed, 1 Nov 2023 12:58:55 +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=ham 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 9307F27BBE2 for ; Wed, 1 Nov 2023 12:58:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyAnt-0004Oy-EF; Wed, 01 Nov 2023 08:58:37 -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 1qyAnn-0004Ng-EO for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:32 -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 1qyAnn-0008ME-6N for guix-patches@gnu.org; Wed, 01 Nov 2023 08:58:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyAoK-0007VB-05; Wed, 01 Nov 2023 08:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH 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: Wed, 01 Nov 2023 12:59:03 +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.169884350628748 (code B ref 66879); Wed, 01 Nov 2023 12:59:03 +0000 Received: (at 66879) by debbugs.gnu.org; 1 Nov 2023 12:58:26 +0000 Received: from localhost ([127.0.0.1]:50157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAni-0007Tb-EO for submit@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:26 -0400 Received: from lepiller.eu ([89.234.186.109]:57970 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyAng-0007Sl-HT for 66879@debbugs.gnu.org; Wed, 01 Nov 2023 08:58:24 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 312743aa for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:49 +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=jbZKd07Wcbd/7SB0rUheRVHzSODUcbZSMQgNZ6d1J mFUf/EooPAp5dNP+OoFs7QFe4Zh4AHToaudB2BZPNkFDktVAMmZ0hTjV+EYZnc5x X92O6KsZBh7rG+MPUAWdBqBl4A9m6GPr9aXgPJGrJzgkoDcQzu8xnwJl7pv/dK6I NnTEC2GSzfxq81fdB+lvhQJ7I61j/idUS6zdyyBQLflaWfLcN4ni/FaYhzyuKf43 dgwbiolA+zJPDy2wlkQsVvBTR7buPBVoaDJlMasNxj+IobRNiKMFLcAPJLJJlrHF GWDfl0o1To1tnjojbprxt1A/kUz4jElGgHOaXV1LPLLgw== Received: by localhost (OpenSMTPD) with ESMTPSA id bd3f726c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Wed, 1 Nov 2023 12:57:48 +0000 (UTC) From: Julien Lepiller Date: Wed, 1 Nov 2023 13:57:30 +0100 Message-ID: <9ad7f05d8a8468e25e4e93554bdbcf1eb2f63326.1698843445.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> References: <1ba00a1093d068dafaef44959ee55a0999695d90.1698843445.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-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