GNU bug report logs - #76840
[PATCH] gnu: java-icu4j: Restore the correct uri for source.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 7 Mar 2025 20:21:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 07 15:21:52 2025
Received: from localhost ([127.0.0.1]:50691 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tqeCe-0003o2-JN
	for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 15:21:52 -0500
Received: from lists.gnu.org ([2001:470:142::17]:40266)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tqeCd-0003no-A4
 for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 15:21:51 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tqeCX-0006dG-1M
 for guix-patches@HIDDEN; Fri, 07 Mar 2025 15:21:45 -0500
Received: from wolfsden.cz ([37.205.8.62])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tqeCU-0004qS-39
 for guix-patches@HIDDEN; Fri, 07 Mar 2025 15:21:44 -0500
Received: by wolfsden.cz (Postfix, from userid 104)
 id 6A2B51EEFF5; Fri,  7 Mar 2025 20:21:34 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1741378894; bh=UyBcRFYK/xI7+TJK35swP0OajdpURY4xEYNH/btpBXo=;
 h=From:To:Cc:Subject:Date;
 b=fNlAH6enQKCQYlIZVoxcd3c9o7ZzXFZL6c6BUP1R4tv9QzQq7ty7Jj3ufUk5ftCq4
 j+Oi8OAoVvoj6KNYmNOY1J1Xh50snsaRxfaZuL/AxFFBUVAnp7qL2CcpZAIwSdfjTv
 ZYYtRUtQ/LSBAK8KpNiGMctyOj4ICXd/DOBAvJUMs8GB+td5E0Ljfb5txKAgGe3ERQ
 TssnOXNKLelyvaU4b3eN/ZkiiIGR6AZetufkTg4JCRUUIp8OvHEml8v9m51gZH6Cwk
 Tq84Az70CVX7v807Ek839cZdVgtw31kq5FiapG6EtCui32Lqx/1EdA+deMSlDW6363
 sXNdCWS4ItiARRZXE/pmh/345H3g4PHIEB2R1am29iosTrZ5MI66atSuq/1F0ONPv7
 kQOiPMuJG0RftyaK0BE14VBWk5Ttf/lb+ZJzPuCIac/EcpYpOGebBrNTCtEjbSdfdB
 jN+uIw++CK2Pz+cNqIU/32c6FaVe7XQvWk/bQdvdGw9qR518PI1YvYvhlhk27wmG64
 eAYInZudC6w6/EC+EfzI4PM1nhRGdDC/a/u/eM5Q6/t5HQ/mn7zQP1/twixuKa0ev2
 nKKm68q4IcANglUn9bqUvBltefOqV4Z6Np3HZ0DmfC+TLwiInzC1ozlsxl/p31NRjj
 LS5iI8iot7yfnME6/ewp93UI=
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden
X-Spam-Level: 
X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF autolearn=ham
 autolearn_force=no version=3.4.6
Received: from localhost (unknown [128.0.188.242])
 by wolfsden.cz (Postfix) with ESMTPSA id 974BB1EEDE7;
 Fri,  7 Mar 2025 20:21:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
 t=1741378893; bh=UyBcRFYK/xI7+TJK35swP0OajdpURY4xEYNH/btpBXo=;
 h=From:To:Cc:Subject:Date;
 b=fJX2tKz8Qqsk3AkLE3NhMYuJrISyBs6Q3rpFd7VpPCMc3Ap5srMUo5bJ89CwEE4LW
 /LOgkfzb8hfGVdOtF9xwqfuHVMCIVmQOuu82yTxJXfyLoFYsoNJCPim7yl2ffmpC1d
 7AxH6X3XcZWCr90AHmpV03H7v6AD9n+21yE2qEd6tgGtWHqw/CDSgv3RP3LymT9ZsU
 kyO5sSqzRlvaMh8QG52GXoaRcBvOHSUJ5PfeFqAAuur0gjSCkEeDYcRehpcBZ9FYrX
 t1LJx1AKibQqUcUPKTj98vStY8hOCzilcRWM151qB68Fue9SW6Bcv5KlVSx2ikzTmD
 RrrUn6gO0cUEaKt+ovDwtzkpijCNhlfcZkCyF9COkwLMN+XBGI7Ns00Bi5ImKK53Pt
 +ahCp6yeiCwEvtdGdc69oYW1Lu8UkmwnWBPv5jtgExIYY0KfgaxW/y210Dg2QAsJes
 O9gNqNF+Ff9OwrXGccRC55edh1AD1YxQ32cvA2lMSd6mItxPmKlp+g2xviot9DxkAA
 5yih1jjY/x/w0GO1VFo96tHlmsT8Al7XR02fs7JOc/8c/FDxw3dm9tnjPWduKCcNDd
 qZqkE982bPOU2+FDcZS53/MdC8UQMuzc90nD+U1eVhA//+Ocx/3O8xvOCujxINyvzL
 U/deuxqGxxDxuiUT5HQYpECI=
From: Tomas Volf <~@wolfsden.cz>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: java-icu4j: Restore the correct uri for source.
Date: Fri,  7 Mar 2025 21:21:28 +0100
Message-ID: <6a18057affc26b865dcc5ca95c1a6a3cfa26f12b.1741378888.git.~@wolfsden.cz>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz;
 helo=wolfsden.cz
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

The refactoring was wrong, so restore the original way for java-icu4j.  Since
that package is just in a single version, the benefit for DRYing is not that
large.

* gnu/packages/icu4c.scm (java-icu4j): Restore the source uri.
(icu4j-uri): Delete procedure.
(icu4?-uri): Rename this...
(icu4c-uri): ... to this.

Change-Id: If157fa2bcb2aca675edd5d2abfbb7f541a241c7c
---
 gnu/packages/icu4c.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 5209f2f19b..2c836a8622 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -43,20 +43,14 @@ (define-module (gnu packages icu4c)
   #:use-module (guix build-system ant)
   #:use-module (guix build-system gnu))
 
-(define (icu4?-uri variant version)
+(define (icu4c-uri version)
   (string-append
    "https://github.com/unicode-org/icu/releases/download/release-"
    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-   "/icu4" variant "-"
+   "/icu4c-"
    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
    "-src.tgz"))
 
-(define (icu4c-uri version)
-  (icu4?-uri "c" version))
-
-(define (icu4j-uri version)
-  (icu4?-uri "j" version))
-
 (define-public icu4c
   (package
     (name "icu4c")
@@ -218,7 +212,12 @@ (define-public java-icu4j
     (version "70.1")
     (source (origin
               (method url-fetch)
-              (uri (icu4j-uri version))
+              (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 "0qrs75iyzn19kf54q55jn8wf6xjlpkrihdwqpxm39jdh2hz4cgvj"))))
     (build-system ant-build-system)
-- 
2.48.1