Subject: [bug#74756] [PATCH gnome-team 1/3] gnu: Make icu4c 73.1 the default.

From: Liliana Marie Prikler <[email-masked]>
Date: Sun, 8 Dec 2024 12:19:47 +0100

* 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/tor-browsers.scm (make-torbrowser): Likewise.
* gnu/packages/gnuzilla.scm (icecat-minimal, icedove-minimal): Likewise.
---
 gnu/packages/gnuzilla.scm     |  4 ++--
 gnu/packages/icu4c.scm        | 21 ++++++++++-----------
 gnu/packages/librewolf.scm    |  2 +-
 gnu/packages/tor-browsers.scm |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8a6c558c50..a65b1fbb8b 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -744,7 +744,7 @@ (define-public icecat-minimal
            ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
            ffmpeg-5
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa
@@ -1550,7 +1550,7 @@ (define-public icedove-minimal
            gtk+
            gtk+-2
            hunspell
-           icu4c-73
+           icu4c
            libcanberra
            libevent
            libffi
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 6f09fae65c..965da509ff 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -45,7 +45,7 @@ (define-module (gnu packages icu4c)
 (define-public icu4c
   (package
     (name "icu4c")
-    (version "71.1")
+    (version "73.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -55,7 +55,12 @@ (define-public icu4c
                     (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
                     "-src.tgz"))
               (sha256
-               (base32 "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))
+               (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
+              (patches
+               (append
+                (search-patches
+                 "icu4c-icu-22132-fix-vtimezone.patch"
+                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")))))
     (build-system gnu-build-system)
     (native-inputs
      (append (list python-minimal)
@@ -109,11 +114,11 @@ (define-public icu4c
     (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
@@ -124,13 +129,7 @@ (define-public icu4c-73
                     "-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-70
   (package
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 6517c1953d..4a42f76f4a 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -657,7 +657,7 @@ (define-public librewolf
                   gtk+
                   gtk+-2
                   hunspell
-                  icu4c-73
+                  icu4c
                   jemalloc
                   libcanberra
                   libevent
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index e517f9b214..30bdedd311 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -248,7 +248,7 @@ (define* (make-torbrowser #:key
            libffi
            ffmpeg
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa
-- 
2.46.0