From 583537f2d6b8e5cd7f4b2f6cc7a6d7d2c9aeae7a Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sat, 25 Jun 2022 11:01:39 +0200
Subject: gnu: Add java-commons-text.

* gnu/packages/java.scm (java-commons-text): New variable.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7b0507d93c3..16bd0d155ab 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7905,6 +7905,40 @@ Commons CLI supports different types of options:
 @item long options with single hyphen (ie. ant -projecthelp)
 @end itemize
 
+This is a part of the Apache Commons Project.")
+    (license license:asl2.0)))
+
+(define-public java-commons-text
+  (package
+    (name "java-commons-text")
+    (version "1.9")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://apache/commons/text/source/"
+                                  "commons-text-" version "-src.tar.gz"))
+              (sha256
+               (base32
+                "1k99ib2dxlqxb5y94kpzf4ix8xgxz1j3n9kq3ddssqqcccsp5ik2"))))
+    (build-system ant-build-system)
+    (arguments
+     (list #:jar-name "java-commons-text.jar"
+           #:source-dir "src/main/java"
+           #:test-dir "src/test"
+           #:tests? #f                  ; Tests require JUnit5.
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'install
+                 (install-from-pom "pom.xml")))))
+    (inputs
+     (list java-commons-io))
+    (propagated-inputs
+     (list java-commons-lang3
+           apache-commons-parent-pom-51))
+    (home-page "https://commons.apache.org/text/")
+    (synopsis "Library focused on algorithms working on strings")
+    (description "Apache Commons Text is a library focused on algorithms
+working on strings.
+
 This is a part of the Apache Commons Project.")
     (license license:asl2.0)))
 
-- 
cgit v1.3


From 3a45cc634e69467e394bb1d70e0fd0a23f003965 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sun, 3 Jul 2022 20:20:18 +0200
Subject: gnu: abcl: Fix loading of cl-* packages.

* gnu/packages/java.scm (abcl)[native-search-paths]: Add XDG_DATA_DIRS where
to cl-* libraries get installed.
---
 gnu/packages/java.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 16bd0d155ab..6113f1470a2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -13766,6 +13766,10 @@ Lisp language featuring both an interpreter and a compiler, running in the
 JVM.  It supports JSR-223 (Java scripting API): it can be a scripting engine
 in any Java application.  Additionally, it can be used to implement (parts of)
 the application using Java to Lisp integration APIs.")
+    (native-search-paths
+     (list (search-path-specification
+            (variable "XDG_DATA_DIRS")
+            (files '("share")))))
     (license (list license:gpl2+
                    ;; named-readtables is released under 3 clause BSD
                    license:bsd-3
-- 
cgit v1.3


From 875e803e60f8312898800d36e74ea0105cb6582c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sun, 3 Jul 2022 20:34:44 +0200
Subject: gnu: abcl: Update to 1.9.0.

* gnu/packages/java.scm (abcl): Update to 1.9.0.
* gnu/packages/patches/abcl-fix-build-xml.patch: Update for 1.9.0.
---
 gnu/packages/java.scm                         |  4 ++--
 gnu/packages/patches/abcl-fix-build-xml.patch | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6113f1470a2..14fef6986ce 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -13711,7 +13711,7 @@ network protocols, and core version control algorithms.")
 (define-public abcl
   (package
     (name "abcl")
-    (version "1.8.0")
+    (version "1.9.0")
     (source
      (origin
        (method url-fetch)
@@ -13719,7 +13719,7 @@ network protocols, and core version control algorithms.")
                            version "/abcl-src-" version ".tar.gz"))
        (sha256
         (base32
-         "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx"))
+         "0scqq5c7201xhp0g6i4y3m2nrk6l5any1nisiscbsd48ya25qax1"))
        (patches
         (search-patches
          "abcl-fix-build-xml.patch"))))
diff --git a/gnu/packages/patches/abcl-fix-build-xml.patch b/gnu/packages/patches/abcl-fix-build-xml.patch
index dd315b42716..12f5cd45102 100644
--- a/gnu/packages/patches/abcl-fix-build-xml.patch
+++ b/gnu/packages/patches/abcl-fix-build-xml.patch
@@ -8,7 +8,7 @@ it non-deterministic.
 
 --- a/build.xml
 +++ b/build.xml
-@@ -327,7 +327,7 @@ from ${abcl.home.dir}
+@@ -338,7 +338,7 @@ from ${abcl.home.dir}
      <property name="abcl.build.path"
                value="${build.classes.dir}/org/armedbear/lisp/build"/>
      <target name="abcl.stamp" 
@@ -17,10 +17,10 @@ it non-deterministic.
        <mkdir dir="${abcl.build.path}/.."/>
        <loadfile property="abcl.version"
                  srcFile="${abcl.version.path}"/>
-@@ -455,11 +455,6 @@ from ${abcl.home.dir}
+@@ -479,11 +479,6 @@ Mercurial and Git.
                  value="${abcl.version}-${abcl.version.src}"/>
      </target>
- 
+
 -    <target name="abcl.stamp.hostname" if="unix">
 -      <exec executable="hostname" outputproperty="abcl.hostname"/>
 -      <echo>abcl.hostname: ${abcl.hostname}</echo>
@@ -29,16 +29,16 @@ it non-deterministic.
      <target name="abcl.system.uptodate">
        <condition property="abcl.system.needs-update.p">
          <and>
-@@ -500,8 +495,6 @@ from ${abcl.home.dir}
+@@ -524,8 +519,6 @@ Mercurial and Git.
                         value="ABCL"/>
              <attribute name="Implementation-Version"  
-                        value="${abcl.implementation.version}"/>
+                        value="${abcl.version}"/>
 -            <attribute name="Implementation-Build" 
 -                       value="${build}"/>
            </section>
          </manifest>
          <metainf dir="${src.dir}/META-INF"> 
-@@ -1019,8 +1012,7 @@ ${basedir}/../cl-bench
+@@ -1050,8 +1043,7 @@ ${basedir}/../cl-bench
        </unzip>
      </target>
          
-- 
cgit v1.3