From patchwork Mon Aug 26 18:18:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 67308 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 CA2E627BBEA; Mon, 26 Aug 2024 19:19:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 1023D27BBE2 for ; Mon, 26 Aug 2024 19:19:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sieJ9-0003uA-Lr; Mon, 26 Aug 2024 14:19:16 -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 1sieJ7-0003tq-EC for guix-patches@gnu.org; Mon, 26 Aug 2024 14:19:13 -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 1sieJ7-00079t-3m for guix-patches@gnu.org; Mon, 26 Aug 2024 14:19:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=hefWJb3DkSFkStEEMZVw7GkcsFfjpYbooFrddOUub2c=; b=gJz8YWDRgnZtsr5Qm1q247WrWO7brFLLSf0z0DgHriNl8NH2Mcpgkeh4ZWbPmEqzfwZZqCACO52/3MNcAKoGAnyqmqKqeINuFS20sdESjtuyPcjYrpqtkkeQ8nedJcQU+/u7gH1+awGCq+XVxZmu0ImH4pju+5vyCIBH+iG9UdKWiH7fZSjsRRsQj9LNPlQHreoWGqjRV7n3iGQloA28V12JrHHiacG+nLmx1MPgJKToT39sNilCkW2DDxV7iBPc81MbZj11bdg0aLlervpyhtD3LZ87pnCmSWHw//0H+6NlMJSq21W6Srr54pwhl7c3T2uzaabnf2RHhfaVPtSYuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sieJu-0005ZO-88; Mon, 26 Aug 2024 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72822] [PATCH 1/2] gnu: java-jmapviewer: Update to 2.20. References: <20240826195639.497dd449@lepiller.eu> In-Reply-To: <20240826195639.497dd449@lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72822 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72822@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 72822-submit@debbugs.gnu.org id=B72822.172469637421355 (code B ref 72822); Mon, 26 Aug 2024 18:20:02 +0000 Received: (at 72822) by debbugs.gnu.org; 26 Aug 2024 18:19:34 +0000 Received: from localhost ([127.0.0.1]:45197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sieJS-0005YM-5h for submit@debbugs.gnu.org; Mon, 26 Aug 2024 14:19:34 -0400 Received: from lepiller.eu ([89.234.186.109]:38734 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sieJP-0005Y5-H3 for 72822@debbugs.gnu.org; Mon, 26 Aug 2024 14:19:32 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 13c63bd6 for <72822@debbugs.gnu.org>; Mon, 26 Aug 2024 18:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=4TgTYPA/97AFKXo71fUOdfMiPG2TWO+z/i1vtZ4xwgU=; b=NUpH k+GVdquxW30mf77QKUYsiJJsLtTIuTmbHtOybPIJVE5pN65gCs0YFW/XXLOistmT wyRiP7DMe/4zE1Ar2wE9c3LYLSzenURN0LRHtUySISf+HXvUAFLKrxK4q/WLp8yh osMvg7SlYjc0RRQFALLZaL3cnv/7KuYTcKvVz2pBQ5O3w0tmJJYI7JPfLC+csfwg 6utg1P0L674yWsQ2aN/2QAM9OaJ90XL7ockorhE0RnGZdYTj3pOa+aKV+BeyLvEQ yEiD9xRBk8VqW9hKvO/peWKh6gMYGf01SOh+bwLJEEPaAmCh0qwDgfeVgVNRudAO 5yJ076W0LCo6L6VwRA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id a984393e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <72822@debbugs.gnu.org>; Mon, 26 Aug 2024 18:18:34 +0000 (UTC) From: Julien Lepiller Date: Mon, 26 Aug 2024 20:18:24 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 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 (java-jmapviewer): Update to 2.20. [source]: Update URL. Change-Id: I75fdb48601854bdda4fd5f7357a2c4c7ce2f54c5 --- gnu/packages/geo.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) base-commit: 4b011ee4abaa9199700b30cd83abadb7f9a66d2d diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 954a4ad4a0..70dc127c1d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2121,15 +2121,15 @@ (define-public python-rtree (define-public java-jmapviewer (package (name "java-jmapviewer") - (version "2.13") + (version "2.20") (source (origin (method url-fetch) - (uri (string-append "https://svn.openstreetmap.org/applications/" - "viewer/jmapviewer/releases/" version - "/JMapViewer-" version "-Source.zip")) + (uri (string-append "https://josm.openstreetmap.de/osmsvn/" + "/applications/viewer/jmapviewer/releases/" + version "/JMapViewer-" version "-Source.zip")) (sha256 (base32 - "0sy6r5fkbb9bclw0is6gwnbzz627m7pjfnsqydxz58pbndakkhrv")))) + "02cvmmvvlqpbwn022w3m60xkq4gh4jh9lajs6yjgvjf2hnwxll31")))) (build-system ant-build-system) (native-inputs (list unzip)) From patchwork Mon Aug 26 18:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 67309 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 4B87227BBEA; Mon, 26 Aug 2024 19:19:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 B050327BBE2 for ; Mon, 26 Aug 2024 19:19:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sieJ9-0003u4-3V; Mon, 26 Aug 2024 14:19:15 -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 1sieJ5-0003tP-Tx for guix-patches@gnu.org; Mon, 26 Aug 2024 14:19:11 -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 1sieJ5-00079i-L4 for guix-patches@gnu.org; Mon, 26 Aug 2024 14:19:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3Ur3M+cXkNBCTO9Ymm0c9ifTkD/XTntsDle8cotFBBY=; b=Sk45DCZeiUTDA1RBEEZbwQvXPYgGhhW0kr3GYbA+zNxZxoFLJix4xyL2HDaRnWr0J02Qapj1PvrzL6zjDMuAYqQQU9/MAzNKPuXdWWSci4aKAZEKRPYbpn9zFIsBBW80NYgVrVl66fwA175sOmMk2aCEBfkJgzPBytpHm7Xy6+FEGH5OARBW4M9hQakkh2/U7XTNatUX6P3VGCw1i24Dig5UhzD22MQ0RBw7TDdmAWQvFTtFYCoX3p3i8kGRCfSsKGVZK3vDY+ZEEF7ng/VyeGKLpNT/Nx/aGeBEHGStqLYbuQ3YpRdQhPoewVtfvKWhEPQMba6euYdg7DhDShS7Ew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sieJu-0005ZV-Lm; Mon, 26 Aug 2024 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72822] [PATCH 2/2] gnu: josm: Update to 19160. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72822 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72822@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 72822-submit@debbugs.gnu.org id=B72822.172469637821367 (code B ref 72822); Mon, 26 Aug 2024 18:20:02 +0000 Received: (at 72822) by debbugs.gnu.org; 26 Aug 2024 18:19:38 +0000 Received: from localhost ([127.0.0.1]:45199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sieJV-0005YY-Kc for submit@debbugs.gnu.org; Mon, 26 Aug 2024 14:19:37 -0400 Received: from lepiller.eu ([89.234.186.109]:38734 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sieJR-0005Y5-7E for 72822@debbugs.gnu.org; Mon, 26 Aug 2024 14:19:34 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 20394d58 for <72822@debbugs.gnu.org>; Mon, 26 Aug 2024 18:18:35 +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=4lN9uRimrpRO1JNL6I01LaS/k EStPJI0ExKaHVilPgU=; b=XfwEs3viF5ndfIe882KY2hQNdh/IpI2UlwSgCXRrj WiHum8Vq5w16d8wOGW1sWAGinr7GE3LNpFmVRFNceV2XVpCZOqO1R33BGenjqRQ2 ryteSuwdrIqpp61ogxDPY8AgDsYoQw6gkdMssPQdu5mJhPoVwdDeuC5Rpi9ygfqN dV9YDfTbcX/zjDi30wsJ2JvD5y/SlpZ8y6P3YY+Mr9ae/gEC379nL6CRXee8imzg Ck5zO5C+mq9rmpkz2efhMKME5JEXpnWv9JFomGLQfVftdSlpqGpFLx7m5fHCl91u WJhWfojzRgnurzMoimGQFbLCFbTFN7cqds+bfmTGMBXWA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 78ea82c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <72822@debbugs.gnu.org>; Mon, 26 Aug 2024 18:18:34 +0000 (UTC) From: Julien Lepiller Date: Mon, 26 Aug 2024 20:18:25 +0200 Message-ID: <14590dc93e101bd37cd6d5f8ad7cefb32bdb3374.1724696223.git.julien@lepiller.eu> X-Mailer: git-send-email 2.45.2 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 19160. [arguments]: Update phases accordingly. Update launcher following josm advice. Change-Id: Ic168cb04cf4248167b0724faecba8f2b2d238527 --- gnu/packages/geo.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 70dc127c1d..171821fe4d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2200,7 +2200,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18907") + (version "19160") (source (origin (method svn-fetch) (uri (svn-reference @@ -2209,7 +2209,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0vkczijw537f4y1b7hfxa45k3ww6nf2cf485b19dnbgh9ab6mnjl")) + "06m6rg9czs7mhkh0byd3c8n8y1gbzqqw2iy7qyn4084al4mdrw2z")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -2280,6 +2280,9 @@ (define-public josm (lambda _ (system* "javac" "scripts/BuildProjectionDefinitions.java" "-cp" "build/classes") + (mkdir-p "resources/data/projection") + (with-output-to-file "resources/data/projection/custom-epsg" + (lambda _ (display ""))) (mkdir-p "data/projection") (with-output-to-file "data/projection/custom-epsg" (lambda _ (display ""))) @@ -2342,6 +2345,9 @@ (define-public josm (not (string-contains jar "-javacc-")))) (string-split (getenv "CLASSPATH") #\:)) ":") + " --add-exports=java.base/sun.security.action=ALL-UNNAMED" + " --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" + " --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" " org.openstreetmap.josm.gui.MainApplication")))) (chmod (string-append bin "/josm") #o755)) #t)))))