me/guix
Archived
1
0
Fork 0
Code Activity

gnu: josm: Update to 16731.

Browse source 
* gnu/packages/geo.scm (josm): Update to 16731.
This commit is contained in:
Julien Lepiller 2020-07-05 01:06:32 +02:00
parent f1abc56655
commit cfdb6770ef
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/geo.scm
View file

@ -1208,7 +1208,7 @@ to the OSM opening hours specification.")
(define-public josm (define-public josm
(package (package
(name "josm") (name "josm")
(version "15937") (version "16731")
(source (origin (source (origin
(method svn-fetch) (method svn-fetch)
(uri (svn-reference (uri (svn-reference
@ -1217,7 +1217,7 @@ to the OSM opening hours specification.")
(recursive? #f))) (recursive? #f)))
(sha256 (sha256
(base32 (base32
"00b8sw0wgkcf7xknmdpn5s521ax8x2660figidcrry37sgq3x946")) "036kdb1ckhym5f7lj5ydzblli7f1i1pl8z00hxvagf2rczdf5fi3"))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -1234,6 +1234,7 @@ to the OSM opening hours specification.")
("java-jsonp-api" ,java-jsonp-api) ("java-jsonp-api" ,java-jsonp-api)
("java-jsonp-impl" ,java-jsonp-impl); runtime dependency ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency
("java-metadata-extractor" ,java-metadata-extractor) ("java-metadata-extractor" ,java-metadata-extractor)
("java-opening-hours-parser" ,java-opening-hours-parser)
("java-openjfx-media" ,java-openjfx-media) ("java-openjfx-media" ,java-openjfx-media)
("java-signpost-core" ,java-signpost-core) ("java-signpost-core" ,java-signpost-core)
("java-svg-salamander" ,java-svg-salamander))) ("java-svg-salamander" ,java-svg-salamander)))
@ -1255,6 +1256,14 @@ to the OSM opening hours specification.")
"<date>1970-01-01 00:00:00 +0000</date>" "<date>1970-01-01 00:00:00 +0000</date>"
"</commit></entry></info>")))) "</commit></entry></info>"))))
#t)) #t))
(add-before 'build 'fix-jcs
(lambda _
;; This version of JOSM uses an unreleased version of commons-jcs,
;; 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"))
#t))
(add-before 'build 'fix-classpath (add-before 'build 'fix-classpath
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CLASSPATH" (setenv "CLASSPATH"
@ -1288,10 +1297,9 @@ to the OSM opening hours specification.")
(invoke "java" "-cp" "build/classes:scripts:." (invoke "java" "-cp" "build/classes:scripts:."
"BuildProjectionDefinitions" ".") "BuildProjectionDefinitions" ".")
#t)) #t))
(add-after 'generate-epsg 'copy-data (add-after 'generate-epsg 'copy-resources
(lambda _ (lambda _
(mkdir-p "build/classes") (copy-recursively "resources" "build/classes")
(rename-file "data" "build/classes/data")
#t)) #t))
(add-before 'install 'regenerate-jar (add-before 'install 'regenerate-jar
(lambda _ (lambda _
@ -1300,16 +1308,6 @@ to the OSM opening hours specification.")
(invoke "jar" "-cf" "build/jar/josm.jar" "-C" (invoke "jar" "-cf" "build/jar/josm.jar" "-C"
"build/classes" ".") "build/classes" ".")
#t)) #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 (add-before 'build 'copy-revision
(lambda _ (lambda _
(mkdir-p "build/classes") (mkdir-p "build/classes")