guix_mirror_bot pushed a commit to branch gnuzilla-updates in repository guix.
commit a9dc35bcab0c23cafb1b38cce7149e67f0df17a8 Author: Maxim Cournoyer <[email protected]> AuthorDate: Tue Aug 12 17:56:46 2025 +0900 gnu: icu4c: Update to 77.1. * gnu/packages/icu4c.scm (icu4c-73): Rename to: (icu4c): ... this. [source]: Delete icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch patch. [#:phases]: Always disable intltest test. (icu4c-71, icu4c-75, icu4c-76, icu4c-77): Delete variables. * gnu/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. * gnu/packages/databases.scm (firebird) [inputs]: Replace icu4c-77 with icu4c. * gnu/packages/librewolf.scm (librewolf): [inputs]: Replace icu4c-76 with icu4c. * gnu/packages/node.scm (node-lts) [native-inputs, inputs]: Likewise. Change-Id: I40cf671035ea45b61405b762991b4cb7cb05091e --- gnu/packages/databases.scm | 2 +- gnu/packages/icu4c.scm | 87 +++++++++++----------------------------------- gnu/packages/librewolf.scm | 2 +- gnu/packages/node.scm | 4 +-- gnu/packages/qt.scm | 1 - 5 files changed, 24 insertions(+), 72 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a8196648f6..08e09eed91 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -447,7 +447,7 @@ ElasticSearch server") (inputs (list boost editline - icu4c-77 + icu4c libtommath ncurses zlib)) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 0c0351dd9d..4c4c7182da 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]> ;;; Copyright © 2023 Nicolas Graves <[email protected]> ;;; Copyright © 2024 Zheng Junjie <[email protected]> +;;; Copyright © 2025 Maxim Cournoyer <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,19 +52,18 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) -(define-public icu4c-73 +(define-public icu4c (package (name "icu4c") - (version "73.1") + (version "77.1") (source (origin (method url-fetch) (uri (icu4c-uri version)) (sha256 - (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) + (base32 "0qa0yapkypywhzx8ai1p27125h9v1qy89f7v3w1kjz1jfwgl73jq")) (patches (search-patches - "icu4c-icu-22132-fix-vtimezone.patch" - "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")))) + "icu4c-icu-22132-fix-vtimezone.patch")))) (build-system gnu-build-system) (native-inputs (append (list python-minimal) @@ -103,25 +103,14 @@ (("(TESTCASE_AUTO\\(unitUsage\\));" all) (string-append "//" all)))))) #~()) - #$@(if (target-x86-32?) - #~((add-after 'unpack 'disable-failing-test - (lambda _ - ;; The test reports 18 errors but it's woefully - ;; unclear which tests actually fail or how to disable - ;; individual tests. - (substitute* "source/test/Makefile.in" - ((" intltest ") " "))))) - #~()) - #$@(if (target-arm32?) - #~((add-after 'unpack 'disable-failing-test - (lambda _ - ;; The caltest test started to fail to compile after - ;; the upgrade to gcc-14 but it's unclear which test is - ;; failing or how to disable just that one test. - ;; Error: co-processor offset out of range - (substitute* "source/test/Makefile.in" - ((" intltest ") " "))))) - #~()) + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; The caltest test started to fail to compile after + ;; the upgrade to gcc-14 but it's unclear which test is + ;; failing or how to disable just that one test. + ;; Error: co-processor offset out of range + (substitute* "source/test/Makefile.in" + ((" intltest ") " ")))) (add-after 'install 'avoid-coreutils-reference ;; Don't keep a reference to the build tools. (lambda _ @@ -136,55 +125,19 @@ C/C++ part.") (license x11) (home-page "https://icu.unicode.org/";))) -(define-public icu4c icu4c-73) - -(define-public icu4c-71 - (package - (inherit icu4c) - (name "icu4c") - (version "71.1") - (source (origin - (method url-fetch) - (uri (icu4c-uri version)) - (sha256 - (base32 - "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7")))))) - -(define-public icu4c-75 - (package - (inherit icu4c) - (name "icu4c") - (version "75.1") - (source (origin - (method url-fetch) - (uri (icu4c-uri version)) - (sha256 - (base32 - "1vya31v549pq89kgr02jajwi7gc7qw0mv6n4265pxs6jwkrqv5nb")))))) - -(define-public icu4c-76 - (package - (inherit icu4c) - (name "icu4c") - (version "76.1") - (source (origin - (method url-fetch) - (uri (icu4c-uri version)) - (sha256 - (base32 - "0gjg1zrnqk4vmidqgqx4xbz05898px212gnff8242is7zrmv9b6z")))))) - -(define-public icu4c-77 +(define-public icu4c-73 (package (inherit icu4c) - (name "icu4c") - (version "77.1") + (version "73.1") (source (origin (method url-fetch) (uri (icu4c-uri version)) (sha256 - (base32 - "0qa0yapkypywhzx8ai1p27125h9v1qy89f7v3w1kjz1jfwgl73jq")))))) + (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) + (patches + (search-patches + "icu4c-icu-22132-fix-vtimezone.patch" + "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")))))) (define-public icu4c-build-root (package diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index c26ccde598..346249f504 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -632,7 +632,7 @@ gtk+ gtk+-2 hunspell - icu4c-76 + icu4c jemalloc libcanberra libevent diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1e460f8db5..0563d6eb55 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -963,7 +963,7 @@ fi" (list ;; Runtime dependencies for binaries used as a bootstrap. c-ares-for-node-lts brotli - icu4c-76 + icu4c libuv-for-node-lts `(,nghttp2 "lib") openssl @@ -979,7 +979,7 @@ fi" (list bash-minimal coreutils c-ares-for-node-lts - icu4c-76 + icu4c libuv-for-node-lts llhttp-bootstrap brotli diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6632902b16..6d71766b26 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4029,7 +4029,6 @@ linux/libcurl_wrapper.h" (inputs (modify-inputs (package-inputs qtwebengine-5) (replace "ffmpeg" ffmpeg) - (replace "icu4c" icu4c-75) (replace "re2" re2-next) (replace "qtmultimedia" qtmultimedia) (append fp16 fxdiv libxkbfile xkeyboard-config)))
