Update josm.

Julien LepillerSat Apr 13 11:29:09+0200 2019

25b5092

Update josm.

more/packages/java.scm

15871587
(define-public java-josm
15881588
  (package
15891589
    (name "java-josm")
1590-
    (version "14760")
1590+
    (version "14824")
15911591
    (source (origin
1592-
              (method svn-fetch)
1593-
              (uri (svn-reference
1594-
                    (url "https://svn.openstreetmap.org/applications/editors/josm")
1595-
                    (revision (string->number version))))
1592+
              (method git-fetch)
1593+
              (uri (git-reference
1594+
                     (url "https://github.com/openstreetmap/josm.git")
1595+
                     (commit "4b30f7f925343c90f40d02a350645c890eb7af9e")))
1596+
              ;(method svn-fetch)
1597+
              ;(uri (svn-reference
1598+
              ;      (url "https://svn.openstreetmap.org/applications/editors/josm")
1599+
              ;      (revision (string->number version))))
15961600
              (sha256
15971601
               (base32
1598-
                "1g5pb24bjanfmajvg5l4xp5iqy7rpary8b27489xfkyfi04kskcz"))
1599-
              (file-name (string-append name "-" version))
1602+
                "0psjf9xjvhn1zz8d6sp0jhdzcxk3nwvj16bz6lkyknb8zwc22xds"))
1603+
              (file-name (git-file-name name version))
16001604
              (modules '((guix build utils)))
16011605
              (snippet
16021606
                `(begin
16031607
                   (for-each delete-file (find-files "." ".*.jar"))
1604-
                   (with-directory-excursion "core"
1605-
                     (delete-file-recursively "test/lib")
1606-
                     (delete-file-recursively "windows"))
1608+
                   ;(with-directory-excursion "core"
1609+
                   ;  (delete-file-recursively "test/lib")
1610+
                   ;  (delete-file-recursively "windows"))
16071611
                   #t))))
16081612
    (build-system ant-build-system)
16091613
    (native-inputs

16311635
       #:jar-name "josm.jar"
16321636
       #:phases
16331637
       (modify-phases %standard-phases
1634-
         (add-after 'unpack 'chdir
1635-
           (lambda _
1636-
             (chdir "core")
1637-
             #t))
1638-
         (add-after 'chdir 'rm-build.xml
1638+
         ;(add-after 'unpack 'chdir
1639+
         ;  (lambda _
1640+
         ;    (chdir "core")
1641+
         ;    #t))
1642+
         (add-after 'unpack 'rm-build.xml
16391643
           (lambda* _
16401644
             (delete-file "build.xml")
16411645
             #t))