Update and unbundle josm

Julien LepillerThu May 02 20:04:16+0200 2019

e30dad1

Update and unbundle josm

java-svg-salamander-Fix-non-det.patch unknown status 1

1+
From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001
2+
From: Julien Lepiller <julien@lepiller.eu>
3+
Date: Thu, 2 May 2019 19:05:33 +0200
4+
Subject: [PATCH] Fix non determinism and installation
5+
6+
---
7+
 svg-core/build.xml                | 22 ----------------------
8+
 svg-core/nbproject/build-impl.xml |  1 -
9+
 2 files changed, 23 deletions(-)
10+
11+
diff --git a/svg-core/build.xml b/svg-core/build.xml
12+
index cc72eb7..0f9c3e6 100755
13+
--- a/svg-core/build.xml
14+
+++ b/svg-core/build.xml
15+
@@ -102,7 +102,6 @@
16+
         <jar destfile="${maven-javadoc-jar}" update="false">

17+
             <manifest>

18+
                 <attribute name="Version" value="${version}"/>

19+
-                <attribute name="Date" value="${TODAY}"/>

20+
             </manifest>

21+
 

22+
             <fileset dir="dist/javadoc">

23+
@@ -112,7 +111,6 @@
24+
         <jar destfile="${maven-sources-jar}" update="false">

25+
             <manifest>

26+
                 <attribute name="Version" value="${version}"/>

27+
-                <attribute name="Date" value="${TODAY}"/>

28+
             </manifest>

29+
 

30+
             <fileset dir="src/main/java">

31+
@@ -126,7 +124,6 @@
32+
             <manifest>

33+
                 <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>

34+
                 <attribute name="Version" value="${version}"/>

35+
-                <attribute name="Date" value="${TODAY}"/>

36+
             </manifest>

37+
 

38+
             <fileset dir="build/classes">

39+
@@ -203,7 +200,6 @@
40+
             <manifest>

41+
                 <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>

42+
                 <attribute name="Version" value="${version}"/>

43+
-                <attribute name="Date" value="${TODAY}"/>

44+
             </manifest>

45+
 

46+
             <fileset dir="build/classes">

47+
@@ -213,24 +209,6 @@
48+
             </fileset>

49+
         </jar>

50+
 

51+
-        <delete file="${key.location}"/>

52+
-        <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">

53+
-            <dname>

54+
-                <param name="CN" value="Mark McKay, mark@kitfox.com"/>

55+
-                <param name="OU" value="kitfox.com"/>

56+
-                <param name="O"  value="kitfox"/>

57+
-                <param name="L"  value="Toronto"/>

58+
-                <param name="S"  value="Ontario"/>

59+
-                <param name="C"  value="CA"/>

60+
-            </dname>

61+
-        </genkey>

62+
-

63+
-        <copy file="${dist.jar}" toFile="${project.www.jar}"/>

64+
-        <signjar jar="${project.www.jar}"

65+
-                 alias="${key.user}"

66+
-                 storepass="${key.password}"

67+
-                 keystore="${key.location}"/>

68+
-

69+
         <delete file="${project.tiny.jar}"/>

70+
         <jar destfile="${project.tiny.jar}" update="true">

71+
             <manifest>

72+
diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml
73+
index b448d8a..37725ad 100755
74+
--- a/svg-core/nbproject/build-impl.xml
75+
+++ b/svg-core/nbproject/build-impl.xml
76+
@@ -1045,7 +1045,6 @@ is divided into following sections:
77+
         </manifest>

78+
     </target>

79+
     <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">

80+
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>

81+
         <echo level="info">To run this application from the command line without Ant, try:</echo>

82+
         <property location="${dist.jar}" name="dist.jar.resolved"/>

83+
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>

84+
-- 
85+
2.21.0
86+
more/packages/java.scm
612612 
    (inputs
613613 
     `(("java-guava" ,java-guava)
614614 
       ("java-jboss-javassist" ,java-jboss-javassist)
615-
       ("java-jsonp" ,java-jsonp)))
615+
       ("java-jsonp-api" ,java-jsonp-api)))
616616 
    (native-inputs
617617 
     `(("javacc" ,javacc)
618618 
       ("java-hamcrest-core" ,java-hamcrest-core)
…
15841584 
    (description "")
15851585 
    (license license:bsd-2)))
15861586 
1587+
(define-public java-xmp
1588+
  (package
1589+
    (name "java-xmp")
1590+
    (version "5.1.3")
1591+
    (source (origin
1592+
              (method url-fetch)
1593+
              (uri (string-append "http://download.macromedia.com/pub/developer"
1594+
                                  "/xmp/sdk/XMPCoreJava-" version ".zip"))
1595+
              (sha256
1596+
               (base32
1597+
                "14nai2mmsg7l5ya2y5mx4w4lr1az3sk2fjz6hiy4zdrsavgvl1g7"))))
1598+
    (build-system ant-build-system)
1599+
    (arguments
1600+
     `(#:build-target "build"
1601+
       #:tests? #f; no tests
1602+
       #:phases
1603+
       (modify-phases %standard-phases
1604+
         (add-after 'unpack 'chdir
1605+
           (lambda _
1606+
             (chdir "XMPCore")
1607+
             #t))
1608+
         (replace 'install
1609+
           (install-jars "."))
1610+
         (add-after 'install 'install-doc
1611+
           (lambda* (#:key outputs #:allow-other-keys)
1612+
             (copy-recursively
1613+
               "docs"
1614+
               (string-append (assoc-ref outputs "out") "/share/doc/java-xmp"))
1615+
             #t)))))
1616+
    (native-inputs
1617+
     `(("unzip" ,unzip)))
1618+
    (home-page "")
1619+
    (synopsis "")
1620+
    (description "")
1621+
    (license license:bsd-3)))
1622+
1623+
(define-public java-metadata-extractor
1624+
  (package
1625+
    (name "java-metadata-extractor")
1626+
    (version "2.11.0")
1627+
    (source (origin
1628+
              (method git-fetch)
1629+
              (uri (git-reference
1630+
                     (url "https://github.com/drewnoakes/metadata-extractor")
1631+
                     (commit version)))
1632+
              (file-name (git-file-name name version))
1633+
              (sha256
1634+
               (base32
1635+
                "06yrq0swrl1r40yjbk5kqzjxr04jlkq9lfi711jvfgjf5kp2qinj"))))
1636+
    (build-system ant-build-system)
1637+
    (arguments
1638+
     `(#:jar-name "metadata-extractor.jar"
1639+
       #:source-dir "Source"
1640+
       #:test-dir "Tests"
1641+
       #:phases
1642+
       (modify-phases %standard-phases
1643+
         (add-before 'check 'fix-test-dir
1644+
           (lambda _
1645+
             (substitute* "build.xml"
1646+
               (("/java\">") "\">"))
1647+
             #t)))))
1648+
    (propagated-inputs
1649+
     `(("java-xmp" ,java-xmp)))
1650+
    (native-inputs
1651+
     `(("java-hamcrest-core" ,java-hamcrest-core)
1652+
       ("java-junit" ,java-junit)))
1653+
    (home-page "https://github.com/drewnoakes/metadata-extractor")
1654+
    (synopsis "")
1655+
    (description "")
1656+
    (license license:asl2.0)))
1657+
1658+
(define-public java-signpost-core
1659+
  (package
1660+
    (name "java-signpost-core")
1661+
    (version "1.2.1.2")
1662+
    (source (origin
1663+
              (method git-fetch)
1664+
              (uri (git-reference
1665+
                     (url "https://github.com/mttkay/signpost")
1666+
                     (commit version)))
1667+
              (file-name (git-file-name name version))
1668+
              (sha256
1669+
               (base32
1670+
                "1l04yj2znch3hpyw90c4g4jan453w7d88l84bgl0c72i2kbb8z7h"))))
1671+
    (build-system ant-build-system)
1672+
    (arguments
1673+
     `(#:jar-name "signpost-core.jar"
1674+
       #:source-dir "signpost-core/src/main/java"
1675+
       #:test-dir "signpost-core/src/test"
1676+
       ;; Tests all fail with InstantiationException from mockito
1677+
       #:tests? #f))
1678+
    (propagated-inputs
1679+
     `(("java-commons-codec" ,java-commons-codec)))
1680+
    ;(native-inputs
1681+
    ; `(("java-cglib" ,java-cglib)
1682+
    ;   ("java-hamcrest-core" ,java-hamcrest-core)
1683+
    ;   ("java-junit" ,java-junit)
1684+
    ;   ("java-mockito-1" ,java-mockito-1)))
1685+
    (home-page "https://github.com/mttkay/signpost")
1686+
    (synopsis "")
1687+
    (description "")
1688+
    (license license:asl2.0)))
1689+
1690+
(define-public java-svg-salamander
1691+
  (package
1692+
    (name "java-svg-salamander")
1693+
    (version "1.1.2")
1694+
    (source (origin
1695+
              (method git-fetch)
1696+
              (uri (git-reference
1697+
                     (url "https://github.com/blackears/svgSalamander")
1698+
                     (commit (string-append "v" version))))
1699+
              (file-name (git-file-name name version))
1700+
              (sha256
1701+
               (base32
1702+
                "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf"))
1703+
              (modules '((guix build utils)))
1704+
              (snippet
1705+
                `(for-each delete-file (find-files "." ".*.jar")))
1706+
              (patches
1707+
                (search-patches "java-svg-salamander-Fix-non-det.patch"))))
1708+
    (build-system ant-build-system)
1709+
    ;(arguments
1710+
    ; `(#:jar-name "svg-core.jar"
1711+
    ;   #:source-dir "svg-core/src/main/java"
1712+
    ;   #:tests? #f; no tests
1713+
    ;   #:phases
1714+
    ;   (modify-phases %standard-phases
1715+
    ;     (add-before 'build 'copy-res
1716+
    ;       (lambda _
1717+
    ;         (copy-recursively "src/main/res" "build/classes")
1718+
    ;         #t)))))
1719+
    (arguments
1720+
     `(#:tests? #f; no tests
1721+
       #:phases
1722+
       (modify-phases %standard-phases
1723+
         (add-after 'unpack 'chdir
1724+
           (lambda _
1725+
             (chdir "svg-core")
1726+
             #t))
1727+
         (add-before 'build 'copy-jars
1728+
           (lambda* (#:key inputs #:allow-other-keys)
1729+
             (copy-file (car (find-files (assoc-ref inputs "java-javacc") "\\.jar$"))
1730+
                        "../libraries/javacc.jar")
1731+
             (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$"))
1732+
                        "../libraries/ant.jar")
1733+
             #t))
1734+
         (replace 'install
1735+
           (install-jars "dist")))))
1736+
    (native-inputs
1737+
     `(("java-javacc" ,java-javacc)))
1738+
    (home-page "https://github.com/blackears/svgSalamander")
1739+
    (synopsis "")
1740+
    (description "")
1741+
    (license license:bsd-2)))
1742+
15871743 
(define-public java-josm
15881744 
  (package
15891745 
    (name "java-josm")
1590-
    (version "14824")
1746+
    (version "15031")
15911747 
    (source (origin
15921748 
              (method git-fetch)
15931749 
              (uri (git-reference
15941750 
                     (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))))
1751+
                     (commit "04d4c64b1b5698c0f9af40938f32194bc25bf75f")))
16001752 
              (sha256
16011753 
               (base32
1602-
                "0psjf9xjvhn1zz8d6sp0jhdzcxk3nwvj16bz6lkyknb8zwc22xds"))
1754+
                "0dgxa0yqh2sxl6nvpzw9507y5rdfxvmy54bhk2gfk1hxh3hvgmxh"))
16031755 
              (file-name (git-file-name name version))
16041756 
              (modules '((guix build utils)))
16051757 
              (snippet
16061758 
                `(begin
16071759 
                   (for-each delete-file (find-files "." ".*.jar"))
1608-
                   ;(with-directory-excursion "core"
1609-
                   ;  (delete-file-recursively "test/lib")
1610-
                   ;  (delete-file-recursively "windows"))
1760+
                   (for-each delete-file-recursively
1761+
                     '("src/org/apache"
1762+
                       "src/org/glassfish"
1763+
                       "src/org/tukaani"
1764+
                       "src/javax"
1765+
                       "src/oauth"
1766+
                       "src/com"))
16111767 
                   #t))))
16121768 
    (build-system ant-build-system)
16131769 
    (native-inputs
16141770 
     `(("java-javacc" ,java-javacc)))
1615-
    (propagated-inputs
1616-
     `(("java-jmapviewer" ,java-jmapviewer)
1617-
       ("java-tomcat" ,java-tomcat)
1618-
       ("java-brotli-dec" ,java-brotli-dec)
1619-
       ("java-xz" ,java-xz)
1620-
       ("java-velocity" ,java-velocity)
1771+
    (inputs
1772+
     `(("java-commons-jcs" ,java-commons-jcs)
1773+
       ("java-commons-compress" ,java-commons-compress-latest)
1774+
       ("java-jmapviewer" ,java-jmapviewer)
1775+
       ("java-jsonp-api" ,java-jsonp-api)
1776+
       ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency
1777+
       ("java-metadata-extractor" ,java-metadata-extractor)
16211778 
       ("java-openjfx" ,java-openjfx)
16221779 
       ("java-openjfx-base" ,java-openjfx-base)
16231780 
       ("java-openjfx-media" ,java-openjfx-media)
16241781 
       ("java-openjfx-graphics" ,java-openjfx-graphics)
1625-
       ("java-avalon-framework-api" ,java-avalon-framework-api)
1626-
       ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient)
1627-
       ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore)
1628-
       ("java-commons-jcs" ,java-commons-jcs)
1629-
       ("java-commons-collections" ,java-commons-collections)
1630-
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
1631-
       ("java-commons-compress" ,java-commons-compress-latest)
1782+
       ("java-signpost-core" ,java-signpost-core)
1783+
       ("java-svg-salamander" ,java-svg-salamander)
16321784 
       ("java-zstd" ,java-zstd)))
16331785 
    (arguments
16341786 
     `(#:tests? #f
16351787 
       #:jar-name "josm.jar"
16361788 
       #:phases
16371789 
       (modify-phases %standard-phases
1638-
         ;(add-after 'unpack 'chdir
1639-
         ;  (lambda _
1640-
         ;    (chdir "core")
1641-
         ;    #t))
16421790 
         (add-after 'unpack 'rm-build.xml
16431791 
           (lambda* _
16441792 
             (delete-file "build.xml")
…
28543002 
             #t)))))
28553003 
    (inputs
28563004 
     `(("java-jboss-modules" ,java-jboss-modules)
2857-
       ("java-jsonp" ,java-jsonp)))
3005+
       ("java-jsonp-api" ,java-jsonp-api)))
28583006 
       ;("java-wildfly-common" ,java-wildfly-common)))
28593007 
    (home-page "")
28603008 
    (synopsis "")
…
28763024 
             #t)))))
28773025 
    (inputs
28783026 
     `(("java-jboss-modules" ,java-jboss-modules)
2879-
       ("java-jsonp" ,java-jsonp)
3027+
       ("java-jsonp-api" ,java-jsonp-api)
28803028 
       ("java-wildfly-common" ,java-wildfly-common)))))
28813029 
28823030 
(define-public java-jboss-logging
…
46634811 
(define-public java-commons-pool2
46644812 
  (package
46654813 
    (name "java-commons-pool2")
4666-
    (version "2.4.2")
4814+
    (version "2.6.2")
46674815 
    (source (origin
46684816 
              (method url-fetch)
46694817 
              (uri (string-append "mirror://apache/commons/pool/source/"
46704818 
                                  "commons-pool2-" version "-src.tar.gz"))
46714819 
              (sha256
46724820 
               (base32
4673-
                "11hbkh9djzm2v486ypykmawf92li7z20xazpk5dp9zsl937s024f"))))
4821+
                "1fi1hgqmq01bs6azbj3sfswxzadp2r8sjjfiq6ryilz1m50kvrv6"))))
46744822 
    (arguments
4675-
     `(#:build-target "build-jar"
4676-
       #:test-target "test"
4677-
       #:phases
4678-
       (modify-phases %standard-phases
4679-
         (replace 'install
4680-
           (lambda* (#:key outputs #:allow-other-keys)
4681-
             (let ((target (string-append (assoc-ref outputs "out")
4682-
                                          "/share/java")))
4683-
               (install-file (string-append "dist/commons-pool2-" ,version ".jar")
4684-
                             target)))))))
4823+
     `(#:jar-name "common-pool.jar"
4824+
       #:source-dir "src/main/java"
4825+
       #:test-exclude
4826+
       (list "**/PerformanceTest.java")))
46854827 
    (build-system ant-build-system)
46864828 
    (inputs
46874829 
     `(("java-cglib" ,java-cglib)))
…
46984840 
(define-public java-commons-dbcp2
46994841 
  (package
47004842 
    (name "java-commons-dbcp2")
4701-
    (version "2.1")
4843+
    (version "2.6.0")
47024844 
    (source (origin
47034845 
              (method url-fetch)
47044846 
              (uri (string-append "mirror://apache/commons/dbcp/source/"
47054847 
                                  "commons-dbcp2-" version "-src.tar.gz"))
47064848 
              (sha256
47074849 
               (base32
4708-
                "023p6qlwyj8i75gcycxqi6i9b3rxpzq5pim0l37i8lrsvhhm19z1"))))
4850+
                "0axbvcbnf2l70fc3ybrlp3siw2w4ka9mia2pnx4py8gz54cpw3rc"))))
47094851 
    (arguments
47104852 
     `(#:source-dir "src/main/java"
47114853 
       #:jar-name "java-commons-dbcp.jar"
…
47484890 
(define-public java-commons-jcs
47494891 
  (package
47504892 
    (name "java-commons-jcs")
4751-
    (version "2.1")
4893+
    (version "2.2.1")
47524894 
    (source (origin
47534895 
              (method url-fetch)
47544896 
              (uri (string-append "mirror://apache/commons/jcs/source/"
47554897 
                                  "commons-jcs-dist-" version "-src.tar.gz"))
47564898 
              (sha256
47574899 
               (base32
4758-
                "17l78mpxx1qkgp213b91sl69wawv6xzgllr479mygbg76ygwpffv"))))
4900+
                "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q"))))
47594901 
    (build-system ant-build-system)
47604902 
    (arguments
47614903 
     `(#:jar-name "commons-jcs.jar"
…
47694911 
             (substitute* "commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java"
47704912 
                (("commons.dbcp") "commons.dbcp2")
47714913 
                ((".*\\.setMaxActive.*") ""))
4772-
             ;; Remove dependency on velocity-tools
4773-
             (delete-file "commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java"))))))
4914+
             ;;; Remove dependency on velocity-tools
4915+
             (delete-file "commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java")
4916+
             #t)))))
47744917 
    (propagated-inputs
4775-
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
4918+
     `(("java-classpathx-servletapi" ,java-classpathx-servletapi)
4919+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
47764920 
       ("java-commons-httpclient" ,java-commons-httpclient)
4777-
       ("java-commons-dbcp" ,java-commons-dbcp2)
4778-
       ("java-velocity" ,java-velocity)))
4921+
       ("java-commons-dbcp" ,java-commons-dbcp2)))
47794922 
    (native-inputs
47804923 
     `(("java-junit" ,java-junit)))
47814924 
    (home-page "https://commons.apache.org/proper/commons-jcs/")
…
62306373 
    (description "")
62316374 
    (license license:bsd-2)))
62326375 
6233-
(define-public java-jsonp
6376+
(define-public java-jsonp-api
62346377 
  (package
6235-
    (name "java-jsonp")
6378+
    (name "java-jsonp-api")
62366379 
    (version "1.1.3")
62376380 
    (source (origin
62386381 
              (method url-fetch)
…
62446387 
                "15d7rp4xb482h8r0j3j83wa34bmz84q89s9n8ydfgz6l492syfhc"))))
62456388 
    (build-system ant-build-system)
62466389 
    (arguments
6247-
     `(#:jar-name "jsonp.jar"
6390+
     `(#:jar-name "jsonp-api.jar"
62486391 
       #:tests? #f
62496392 
       #:source-dir "api/src/main/java"
62506393 
       #:test-dir "api/src/test"))
…
62546397 
    (license (list license:gpl2
62556398 
                   license:epl2.0))))
62566399 
6400+
(define-public java-jsonp-impl
6401+
  (package
6402+
    (inherit java-jsonp-api)
6403+
    (name "java-jsonp-impl")
6404+
    (arguments
6405+
     `(#:jar-name "jsonp-impl.jar"
6406+
       #:tests? #f
6407+
       #:source-dir "impl/src/main/java"
6408+
       #:test-dir "impl/src/test"))
6409+
    (propagated-inputs
6410+
     `(("java-jsonp-api" ,java-jsonp-api)))))
6411+
62576412 
(define-public ant-junit
62586413 
  (package
62596414 
    (inherit ant)