Re: icu4j, antlr4, source archives without a root path

["Björn Höfling" <bjoern.hoefling@bjoernhoefling.de>]

[-- Attachment #1.1: Type: text/plain, Size: 1024 bytes --]

Hi Michael,

what is the central message of your email? Is it just to say "I gave
up, sorry", or do you need help at specific points? :-)

At least I can tell you that I have quite a bunch of work-in-progress
branches lying around because I start with "Oh, let's _just_
update/fix/add this little program ..." and you end up in a chain of
needed updates, conflicting updates, broken states, etc.

Don't get confused by this :-) I try to plan my work step by step in
these situations, cleanly commit what's finished and write a personal
log of the success and failures and intermediate knowledge gained.

To the concrete java-icu4j:

What do you think about the attached patch (needs some clean-up)?

What's a bit uncommon about the project is that it builds separate
sub-projects and then combines them. I'm not sure about the output(s):
There are icu4j.jar, icu4j-charset.jar and icu4j-localespi.jar, I only
copied the first one as I think this is what the original package
definition did.

Björn

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-java-icu4c-Update-to-66.1-use-full-sources.patch --]
[-- Type: text/x-patch, Size: 2971 bytes --]

From 85516c2319a94f1e4b22954efd32f489d7d3925e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 <bjoern.hoefling@bjoernhoefling.de>
Date: Tue, 12 May 2020 20:27:59 +0200
Subject: [PATCH] gnu: java-icu4c: Update to 66.1, use full sources.

* gnu/packages/icu4c.scm (java-icu4c): Update to 66.1.
[source]: Use full sources instead of jar-sources.
[arguments]: Add chdir phase, replace install phase.
---
 gnu/packages/icu4c.scm | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index cf76c6fe20..ccced11f81 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -117,22 +118,33 @@ C/C++ part.")
 (define-public java-icu4j
   (package
     (name "java-icu4j")
-    (version "59.1")
+    (version "66.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://download.icu-project.org/files/icu4j/"
-                                  version "/icu4j-"
-                                  (string-map (lambda (x)
-                                                (if (char=? x #\.) #\_ x))
-                                              version)
-                                  "-src.jar"))
+              (uri (string-append
+                    "https://github.com/unicode-org/icu/releases/download/release-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+                    "/icu4j-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+                    ".tgz"))
               (sha256
-               (base32
-                "0bgxsvgi0qcwj60pvcxrf7a3fbk7aksyxnfwpbzavyfrfzixqh0c"))))
+               (base32 "1ahdyz9209lwl7knb2l3gmnkkby221p0vpgx70fj4j02rdzgvw0d"))))
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f                      ; no tests included
-       #:jar-name "icu4j.jar"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'chdir
+           (lambda _
+             (chdir "..")
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((share (string-append (assoc-ref outputs "out")
+                                         "/share/java/")))
+               (mkdir-p share)
+               (install-file "icu4j.jar" share)
+               #t))))))
     (home-page "http://site.icu-project.org/")
     (synopsis "International Components for Unicode")
     (description
-- 
2.26.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]