03/06: gnu: Make icu4c 73.1 the default.

[guix-commits]

lilyp pushed a commit to branch gnome-team
in repository guix.

commit 9d1c353fdb1b0f9750b94eae2baa9edb0acc1f53
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Dec 8 12:19:47 2024 +0100

    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/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/librewolf.scm    |  2 +-
 gnu/packages/tor-browsers.scm |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 29a442903f..4027a17959 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 0ca917305d..38ec0356c4 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/librewolf.scm b/gnu/packages/librewolf.scm
index 42bae0fbc0..38143016f2 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -661,7 +661,7 @@
                   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 32294e2bad..b232087b27 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