Merge remote-tracking branch 'savannah/master' into mesa-updates

Change-Id: Iad185e2ced97067b3dff8fd722435a6c5e2c00e5

1 files changed, 51 insertions, 4 deletions

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4374f59ffa..ff42f748ea 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -70,6 +70,7 @@
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
@@ -933,7 +934,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 +943,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 +966,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")
@@ -972,6 +977,48 @@ efficient, and can be used in any application that needs to edit or view
 source code.")
     (license license:bsd-3)))
 
+(define-public java-autocomplete
+  (package
+    (name "java-autocomplete")
+    (version "3.3.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/bobbylight/AutoComplete")
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ksa3k3xkdjpyq9sbsvchyhfzzpb67pv8xzbpljj8rqilgk8ysy0"))))
+    (build-system ant-build-system)
+    (arguments
+     (list
+      #:tests? #false ;needs junit5
+      #:jar-name "autocomplete.jar"
+      #:source-dir "AutoComplete/src/main/java"
+      #:test-dir "AutoComplete/src/test"
+      #:phases
+      '(modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (copy-recursively "AutoComplete/src/main/resources" "build/classes"))))))
+    (propagated-inputs
+     (list java-rsyntaxtextarea))
+    (native-inputs
+     (list java-hamcrest-core))
+    (home-page "https://github.com/bobbylight/AutoComplete")
+    (synopsis "Text completion library")
+    (description "AutoComplete is a library allowing you to add IDE-like
+auto-completion (aka \"code completion\" or \"Intellisense\") to any Swing
+JTextComponent.  Special integration is added for @code{RSyntaxTextArea},
+since this feature is commonly needed when editing source code.  Features
+include: Drop-down completion choice list. Optional companion \"description\"
+window, complete with full HTML support and navigable with hyperlinks.
+Optional parameter completion assistance for functions and methods, ala
+Eclipse and NetBeans.  Completion information is typically specified in an XML
+file, but can even be dynamic.")
+    (license license:bsd-3)))
+
 ;; We use the sources from git instead of the tarball from pypi, because the
 ;; latter does not include the Cython source file from which bycython.cpp is
 ;; generated.