From 303c729836a47ca4516b174010a615d02d65a45b Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sun, 8 Dec 2024 12:19:47 +0100
Subject: [PATCH] gnu: Make icu4c 73.1 the default.

* gnu/packages/icu4c.scm (icu4c): Update to 73.1.
[patches]: Adjust accordingly.
(icu4c-73): Delete variable.
(icu4c-71): New variable, containing the old icu4c.
* gnu/packages/librewolf.scm (librewolf)[inputs]: Adjust accordingly.
* gnu/packages/node.scm (node-lts): Likewise.
* gnu/packages/tor-browsers.scm (make-torbrowser): Likewise.
* gnu/packages/gnuzilla.scm (icecat-minimal, icedove-minimal): Likewise.
---
 gnu/packages/gnuzilla.scm     |  4 ++--
 gnu/packages/icu4c.scm        | 20 +++++++++-----------
 gnu/packages/node.scm         |  4 ++--
 gnu/packages/tor-browsers.scm |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index fd628a031edb3df09bf50c123587b5807e78dda3..5c7d00e9489aac8c8a094a3b1c1848d84e9f65d9 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -744,7 +744,7 @@ variable defined below.  It requires guile-json to be installed."
            ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
            ffmpeg-5
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa
@@ -1551,7 +1551,7 @@ ca495991b7852b855"))
            gtk+
            gtk+-2
            hunspell
-           icu4c-73
+           icu4c
            libcanberra
            libevent
            libffi
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 0ca917305d98b761df6679c21e6535c23be669f7..38ec0356c4ecd60f78749b595d5afadc2747eb2f 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -46,7 +46,7 @@
 (define-public icu4c
   (package
     (name "icu4c")
-    (version "71.1")
+    (version "73.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -56,7 +56,11 @@
                     (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
                     "-src.tgz"))
               (sha256
-               (base32 "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))
+               (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
+              (patches
+               (search-patches
+                "icu4c-icu-22132-fix-vtimezone.patch"
+                "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      (append (list python-minimal)
@@ -110,11 +114,11 @@ C/C++ part.")
     (license x11)
     (home-page "http://site.icu-project.org/")))
 
-(define-public icu4c-73
+(define-public icu4c-71
   (package
     (inherit icu4c)
     (name "icu4c")
-    (version "73.1")
+    (version "71.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -125,13 +129,7 @@ C/C++ part.")
                     "-src.tgz"))
               (sha256
                (base32
-                "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
-              (patches
-               (append
-                (search-patches
-                 "icu4c-icu-22132-fix-vtimezone.patch"
-                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
-                (origin-patches (package-source icu4c))))))))
+                "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))))
 
 (define-public icu4c-75
   (package
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 75a1a12c539ca953e7f4fd51c44bf7f5300bb095..3d4ce49e9253d9e4c5d1aad7380b113489955eae 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -960,7 +960,7 @@ fi"
      (list ;; Runtime dependencies for binaries used as a bootstrap.
            c-ares-for-node-lts
            brotli
-           icu4c-73
+           icu4c
            libuv-for-node-lts
            `(,nghttp2 "lib")
            openssl
@@ -976,7 +976,7 @@ fi"
      (list bash-minimal
            coreutils
            c-ares-for-node-lts
-           icu4c-73
+           icu4c
            libuv-for-node-lts
            llhttp-bootstrap
            brotli
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 415171339d270663f38182f6da87c109f38bcf7d..b1bba1d26e9775d9f4fadbe89f28d00364e9840d 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -248,7 +248,7 @@ Browser.")
            libffi
            ffmpeg-7
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa