Merge branch 'master' into staging

2025-10-02 02:15:12 +00:00 · 2018-07-30 18:08:28 +02:00 · 2018-07-30 18:08:28 +02:00 · 869250809b
commit 869250809b
parent f419abea22 f475b90c35
35 changed files with 596 additions and 354 deletions
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@ -1862,6 +1862,11 @@ new Date();"))
                  "test-generative-src"
                  "tools-namespace-src"))
               #t))
+           (add-after 'unpack 'fix-manifest-classpath
+             (lambda _
+               (substitute* "build.xml"
+                 (("<attribute name=\"Class-Path\" value=\".\"/>") ""))
+               #t))
           ;; The javadoc target is not built by default.
           (add-after 'build 'build-doc
             (lambda _