Update java-fop (but broken now)

Julien LepillerSun Sep 02 19:07:07+0200 2018

d7db62b

Update java-fop (but broken now)

more/packages/java.scm

44304430 
(define-public java-batik
44314431 
  (package
44324432 
    (name "java-batik")
4433-
    (version "1.9")
4433+
    (version "1.10")
44344434 
    (source (origin
44354435 
              (method url-fetch)
44364436 
              (uri (string-append "mirror://apache/xmlgraphics/batik/source/"
44374437 
                                  "batik-src-" version ".tar.gz"))
44384438 
              (sha256
44394439 
               (base32
4440-
                "18y60rfzbd0ljndaq7a5adjxqbgld4krmpx8fj94k6mcnk03dx5y"))))
4440+
                "05nipxvm940m2dgzmrvflr2r72a5mmqbl25pvqr0xn73a5lygi6z"))))
44414441 
    (build-system ant-build-system)
44424442 
    (arguments
44434443 
     `(#:test-target "regard"; FIXME: no test is actually run
44444444 
       #:build-target "all-jar"
44454445 
       #:phases
44464446 
       (modify-phases %standard-phases
4447+
         (add-before 'check 'remove-failing
4448+
           (lambda _
4449+
             ;; This file looks for w3c.dom.Window, but it has been moved to
4450+
             ;; org.apache.batik.w3c.dom.Window.
4451+
             (delete-file "samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java")
4452+
             #t))
44474453 
         (replace 'install
44484454 
           (lambda* (#:key outputs #:allow-other-keys)
44494455 
             (let ((dir (string-append (assoc-ref outputs "out") "/share/java/")))

…

44524458 
                          (string-append dir "batik-all.jar"))))))))
44534459 
    (inputs
44544460 
     `(("java-xmlgraphics-commons" ,java-xmlgraphics-commons)))
4461+
    (native-inputs
4462+
     `(("java-junit" ,java-junit)))
44554463 
    (home-page "https://xmlgraphics.apache.org/batik")
44564464 
    (synopsis "")
44574465 
    (description "")

…

44604468 
(define-public java-xmlgraphics-commons
44614469 
  (package
44624470 
    (name "java-xmlgraphics-commons")
4463-
    (version "2.2")
4471+
    (version "2.3")
44644472 
    (source (origin
44654473 
              (method url-fetch)
44664474 
              (uri (string-append "mirror://apache/xmlgraphics/commons/source/"
44674475 
                                  "xmlgraphics-commons-" version "-src.tar.gz"))
44684476 
              (sha256
44694477 
               (base32
4470-
                "0i128sj8g29hqc66kqckjr2n1n2amfgijadp5xq4y9fy45q5mrrb"))))
4478+
                "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))))
44714479 
    (build-system ant-build-system)
44724480 
    (arguments
44734481 
     `(#:jar-name "xmlgraphics-commons.jar"

…

44914499 
    (description "")
44924500 
    (license license:asl2.0)))
44934501 
4502+
(define-public java-pdfbox-fontbox
4503+
  (package
4504+
    (name "java-pdfbox-fontbox")
4505+
    (version "2.0.11")
4506+
    (source (origin
4507+
              (method url-fetch)
4508+
              (uri (string-append "mirror://apache/pdfbox/" version "/pdfbox-"
4509+
                                  version "-src.zip"))
4510+
              (sha256
4511+
               (base32
4512+
                "0cmg4kzwqh0fy3wgcn1yik920gx5ja3xjxnra6iq1qxrpdj57fzf"))))
4513+
    (build-system ant-build-system)
4514+
    (arguments
4515+
     `(#:jar-name "fontbox.jar"
4516+
       #:source-dir "src/main/java"
4517+
       #:test-dir "src/test"
4518+
       #:test-exclude
4519+
       (list
4520+
         "**/Abstract*.java"
4521+
         ;; Require downloading fonts
4522+
         "**/CFFParserTest.java"
4523+
         "**/TTFSubsetterTest.java")
4524+
       #:phases
4525+
       (modify-phases %standard-phases
4526+
         (add-before 'build 'copy-resources
4527+
           (lambda _
4528+
             (copy-recursively "src/main/resources" "build/classes")
4529+
             #t))
4530+
         (add-before 'configure 'chdir
4531+
           (lambda _
4532+
             (chdir "fontbox")
4533+
             #t)))))
4534+
    (inputs
4535+
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)))
4536+
    (native-inputs
4537+
     `(("java-hamcrest-core" ,java-hamcrest-core)
4538+
       ("java-junit" ,java-junit)
4539+
       ("unzip" ,unzip)))
4540+
    (home-page "https://xmlgraphics.apache.org")
4541+
    (synopsis "")
4542+
    (description "")
4543+
    (license license:asl2.0)))
4544+
4545+
(define-public java-pdfbox
4546+
  (package
4547+
    (inherit java-pdfbox-fontbox)
4548+
    (name "java-pdfbox")
4549+
    (arguments
4550+
     `(#:jar-name "pdfbox.jar"
4551+
       #:source-dir "src/main/java"
4552+
       #:test-dir "src/test"
4553+
       #:test-exclude
4554+
       (list
4555+
         "**/Abstract*.java"
4556+
         ;; Require network
4557+
         "**/MergeAcroFormsTest.java"
4558+
         "**/MergeAnnotationsTest.java"
4559+
         "**/PDButtonTest.java"
4560+
         ;; Require downloaded resources
4561+
         "**/PDFMergerUtilityTest.java"
4562+
         "**/PDStructureElementTest.java"
4563+
         "**/PDFontTest.java"
4564+
         ;; Can't load image
4565+
         "**/LosslessFactoryTest.java"
4566+
         ;; Unknown failure
4567+
         "**/CCITTFactoryTest.java")
4568+
       #:phases
4569+
       (modify-phases %standard-phases
4570+
         (add-before 'build 'copy-resources
4571+
           (lambda _
4572+
             (copy-recursively "src/main/resources" "build/classes")
4573+
             #t))
4574+
         (add-before 'configure 'chdir
4575+
           (lambda _
4576+
             (chdir "pdfbox")
4577+
             #t)))))
4578+
    (inputs
4579+
     `(("java-bouncycastle" ,java-bouncycastle)
4580+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
4581+
       ("java-diff-utils" ,java-diff-utils)
4582+
       ("java-pdfbox-fontbox" ,java-pdfbox-fontbox)))))
4583+
44944584 
(define-public java-fop
44954585 
  (package
44964586 
    (name "java-fop")
4497-
    (version "2.2")
4587+
    (version "2.3")
44984588 
    (source (origin
44994589 
              (method url-fetch)
45004590 
              (uri (string-append "mirror://apache/xmlgraphics/fop/source/"
45014591 
                                  "fop-" version "-src.tar.gz"))
45024592 
              (sha256
45034593 
               (base32
4504-
                "0lk59ba2388yq69i7wi8nr1k97aw4lkgd6yj96yqif64gzwgwljh"))))
4594+
                "19g4bwdn8h2h3f5ai6as22lav4qg7shr3irdm3v0bzjavflbkkg8"))))
45054595 
    (build-system ant-build-system)
45064596 
    (arguments
45074597 
     `(#:build-target "jar-main"
…
45574647 
       ("java-commons-io" ,java-commons-io)
45584648 
       ("java-xmlgraphics-commons" ,java-xmlgraphics-commons)
45594649 
       ("java-tomcat" ,java-tomcat)
4650+
       ("java-pdfbox-fontbox" ,java-pdfbox-fontbox)
4651+
       ("java-pdfbox" ,java-pdfbox)
45604652 
       ("java-batik" ,java-batik)
45614653 
       ("java-avalon-framework-api" ,java-avalon-framework-api)
45624654 
       ("java-avalon-logkit" ,java-avalon-logkit)))