summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2021-08-27 16:23:40 +0200
committerClément Lassieur <clement@lassieur.org>2021-08-27 16:36:07 +0200
commit7125b0d8a1be58e3f5b66a00fc5912aed9b330e4 (patch)
tree7e9f7948f53d957831f5f31876159f33a391a31b /gnu
parentc9f6fe2c57783812c23caedb94182eb77a800f1f (diff)
gnu: josm: Update to 18118.
* gnu/packages/geo.scm (josm): Update to 18118. [inputs]: Add java-jsr305. [arguments]<#:phases>{fix-jcs}: Replace ICache.NAME_COMPONENT_DELIMITER with what it points to (":") because its location changed with jcs3.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/geo.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index eda50af318..bf864f246c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1407,7 +1407,7 @@ to the OSM opening hours specification.")
(define-public josm
(package
(name "josm")
- (version "17329")
+ (version "18118")
(source (origin
(method svn-fetch)
(uri (svn-reference
@@ -1416,7 +1416,7 @@ to the OSM opening hours specification.")
(recursive? #f)))
(sha256
(base32
- "0bq6mirdsi0kmhjfzfp3innxi5a4395d7mas7ikxaz0cziljrz1i"))
+ "0109ddpxilm7f57n1kl4nf4lw0lh7jfmhfwf724nzlcz4k23mrs0"))
(file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils)))
(snippet
@@ -1432,6 +1432,7 @@ to the OSM opening hours specification.")
("java-jmapviewer" ,java-jmapviewer)
("java-jsonp-api" ,java-jsonp-api)
("java-jsonp-impl" ,java-jsonp-impl); runtime dependency
+ ("java-jsr305" ,java-jsr305)
("java-metadata-extractor" ,java-metadata-extractor)
("java-opening-hours-parser" ,java-opening-hours-parser)
("java-openjfx-media" ,java-openjfx-media)
@@ -1461,7 +1462,8 @@ to the OSM opening hours specification.")
;; which has renamed its classes to another namespace. Rename them
;; back so they can be used with our version of jcs.
(substitute* (find-files "." ".*.java$")
- (("jcs3") "jcs"))
+ (("jcs3") "jcs")
+ (("ICache.NAME_COMPONENT_DELIMITER") "\":\""))
#t))
(add-before 'build 'fix-classpath
(lambda* (#:key inputs #:allow-other-keys)