01/01: gnu: java-xmlgraphics-commons: Remove bundled dependencies.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 02803fdf45541584d0341786d5dfbfb76f17d317
Author: Danny Milosavljevic <address@hidden>
Date:   Sun Oct 7 14:42:15 2018 +0200

    gnu: java-xmlgraphics-commons: Remove bundled dependencies.
    
    * gnu/packages/batik.scm (java-xmlgraphics-commons): Remove bundled
    dependencies.
---
 gnu/packages/batik.scm | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm
index d45600f..9449e56 100644
--- a/gnu/packages/batik.scm
+++ b/gnu/packages/batik.scm
@@ -26,7 +26,8 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages java)
-  #:use-module (gnu packages textutils))
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages xml))
 
 (define-public java-w3c-smil-3.0
   (package
@@ -199,13 +200,16 @@ SAC is an interface for CSS parsers.")
               version "-src.tar.gz"))
         (sha256
          (base32
-          "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))))
+          "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))
+        (modules '((guix build utils)))
+        (snippet
+         `(begin
+            (delete-file-recursively "lib")
+            #t))))
     (build-system ant-build-system)
     (arguments
      `(#:build-target "jar-main"
-       ;; TODO: More detailed tests are available--but they need
-       ;; commons-xml-resolver.
-       ;; TODO: Provide commons-xml-resolver.
+       ;; TODO: More detailed tests are available.
        #:test-target "junit-basic"
        #:phases
        (modify-phases %standard-phases
@@ -215,6 +219,11 @@ SAC is an interface for CSS parsers.")
               (("<attribute name=\"Build-Id\" value=\"[^\"]*\"")
                "<attribute name=\"Build-Id\" value=\"\""))
              #t))
+         (add-before 'build 'prepare-build-directories
+           (lambda _
+             (mkdir "lib")
+             (mkdir "lib/build")
+             #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -225,7 +234,14 @@ SAC is an interface for CSS parsers.")
                                      "xmlgraphics-commons.*\\.jar$"))
                #t))))))
     (native-inputs
-     `(("java-junit" ,java-junit)))
+     `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver)
+       ("java-hamcrest" ,java-hamcrest-core)
+       ("java-junit" ,java-junit)
+       ("java-mockito" ,java-mockito-1)
+       ("java-objenesis" ,java-objenesis)))
+    (propagated-inputs
+     `(("java-commons-io" ,java-commons-io)
+       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
     (home-page "https://xmlgraphics.apache.org/commons/";)
     (synopsis "XMLGraphics constants")
     (description "This package provides XMLGraphics constants (originally