gnu: java-usb4java: Update to 1.3.0.

* gnu/packages/libusb.scm (java-usb4java): Update to 1.3.0.
[arguments]: Use plain list; use SEARCH-INPUT-FILE; adjust
'disable-broken-tests; remove trailing #T from build phases.

Change-Id: Ia5cd72b7c6c0426bcd95804802d14f3e5c728e1c

gnu/packages/libusb.scm

@@ -206,7 +206,7 @@ (define-public go-github-com-google-gousb
 (define-public java-usb4java
   (package
     (name "java-usb4java")
-    (version "1.2.0")
+    (version "1.3.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -215,12 +215,13 @@ (define-public java-usb4java
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0aip6k24czz5g58qwb963mpick0b6ks774drfpdd8gcdvj9iv87j"))))
+                "0fwf8d2swgm8pmvssy53ixnc0pb5bfvc8iy42mf3dwgvr1zzvgmv"))))
     (build-system ant-build-system)
     (arguments
-     `(#:jar-name "usb4java.jar"
+     (list
+      #:jar-name "usb4java.jar"
       #:phases
-       (modify-phases %standard-phases
+      #~(modify-phases %standard-phases
           ;; Usually, native libusb4java libraries for all supported systems
           ;; would be included in the jar and extracted at runtime.  Since we
           ;; build everything from source we cannot just bundle pre-built
@@ -235,10 +236,9 @@ (define-public java-usb4java
                  (string-append
                   line "(final String a, final String b) {"
                   "return \""
-                 (assoc-ref inputs "libusb4java") "/lib/libusb4java.so"
+                  (search-input-file inputs "/lib/libusb4java.so")
                   "\"; }\n"
-                 "private static String _extractLibrary")))
-             #t))
+                  "private static String _extractLibrary")))))
           (add-after 'unpack 'disable-broken-tests
             (lambda _
               (with-directory-excursion "src/test/java/org/usb4java"
@@ -246,12 +246,7 @@ (define-public java-usb4java
                 (substitute* '("LibUsbGlobalTest.java"
                                "TransferTest.java")
                   (("this.context = new Context\\(\\);")
-                  "this.context = null;")
-                 (("LibUsb.init") "//"))
-               (substitute* "DeviceListIteratorTest.java"
-                 (("this.iterator.remove" line)
-                  (string-append "assumeUsbTestsEnabled();" line))))
-             #t)))))
+                   "this.context = null;"))))))))
     (inputs
      (list libusb4java java-commons-lang3 java-junit java-hamcrest-core))
     (home-page "http://usb4java.org/")