From 5e90ee2cf472a35953122f7067bbb185062208f5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 4 Apr 2024 21:33:04 +0200
Subject: gnu: java-rsyntaxtextarea: Update to 3.4.0.

* gnu/packages/textutils.scm (java-rsyntaxtextarea): Update to 3.4.0.
[arguments]: Disable tests; provide source-dir and test-dir; disable
'start-xorg-server phase.
[native-inputs]: Remove java-junit.

Change-Id: I5fbf635bc4f0a6a13ed2db4f42080ea5640f4781
---
 gnu/packages/textutils.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4374f59ffa..0ad0638771 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -933,7 +933,7 @@ Filter, list, or split a tar file.
 (define-public java-rsyntaxtextarea
   (package
     (name "java-rsyntaxtextarea")
-    (version "2.6.1")
+    (version "3.4.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -942,16 +942,20 @@ Filter, list, or split a tar file.
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0dyflzvxq2wvs0rgqfyi5yzzrb6r4bzw2dm8cl304dakxk38ddys"))))
+                "0ad3cmfxwz9963kbh5ryba9jp88hsx03jsl8r4qinwhy6aahx6f3"))))
     (build-system ant-build-system)
     (arguments
      (list
       #:jar-name "rsyntaxtextarea.jar"
+      #:source-dir "RSyntaxTextArea/src/main/java"
+      #:test-dir "RSyntaxTextArea/src/test"
+      #:tests? #false ;requires junit5
       #:phases
       '(modify-phases %standard-phases
          (add-before 'build 'copy-resources
            (lambda _
-             (copy-recursively "src/main/resources" "build/classes")))
+             (copy-recursively "RSyntaxTextArea/src/main/resources" "build/classes")))
+         #;
          (add-before 'check 'start-xorg-server
            (lambda _
              ;; The test suite requires a running X server.
@@ -961,7 +965,7 @@ Filter, list, or split a tar file.
              ;; ‘Fontconfig error: No writable cache directories’
              (setenv "XDG_CACHE_HOME" (getcwd)))))))
     (native-inputs
-     (list java-junit java-hamcrest-core
+     (list java-hamcrest-core
            xorg-server-for-tests))
     (home-page "https://bobbylight.github.io/RSyntaxTextArea/")
     (synopsis "Syntax highlighting text component for Java Swing")
-- 
cgit v1.2.3