From b3927946795eaf3af3da33cefaa76ff67f541a51 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 22 Nov 2026 10:51:40 -0600 Subject: [PATCH] updated icu --- CHANGELOG.md | 2 +- cmake/hashes.cmake | 2 +- src/scripts/versions.sh | 2 +- support/3rd_party/icu_configure.sh | 9 ++++----- support/3rd_party/mingw64/icu-release-78.3.tar.gz.sha256 | 1 - support/3rd_party/mingw64/icu-release-79.1.tar.gz.sha256 | 1 + 6 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 support/3rd_party/mingw64/icu-release-78.3.tar.gz.sha256 create mode 100644 support/3rd_party/mingw64/icu-release-79.1.tar.gz.sha256 diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b4bf8..3d41647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ - `fontconfig` 2.17.1 → 2.18.2 - `freetype2` 2.14.1 → 2.14.3 - `googletest` 1.17.0 → 1.18.0 -- `ICU` 76-1 → 78.3 +- `ICU` 76-1 → 79.1 - `libiconv` 1.18 → 1.19 - `libjpeg-turbo` 3.1.2 → 3.2.0 - `libpng` 1.6.50 → 1.6.59 diff --git a/cmake/hashes.cmake b/cmake/hashes.cmake index 1ee5881..760f895 100644 --- a/cmake/hashes.cmake +++ b/cmake/hashes.cmake @@ -12,7 +12,7 @@ set(FONTCONFIG_HASH cf8e6576ef0484c15079bdaf77cd9c51c464df5365814ada4d3ee7331ea3 set(FREETYPE2_HASH e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1) set(GCC_HASH 7294d65cc1a0558cb815af0ca8c7763d86f7a31199794ede3f630c0d1b0a5723) set(GTEST_HASH 6e3191c1455468b3fc35a417fb565c1c5071aee1b7e7f85e30cf48a98d37d8b5) -set(ICU_HASH f06bcab72736ee9d55689033b8198a178562354128cf38edb2afc2e67e3fd931) +set(ICU_HASH 195b1dbb083321cc097e8cf88eca73de34fb41418f091748f7b6a829a4d40f1d) set(INNOSETUP_HASH 0362a383ed217d4c4239b5933866dd96d3eb2102737da92f80f6057a4b40df2f) set(JSON_HASH 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187) set(LIBBITCOIN_SYSTEM_HASH b5dd2a97289370fbb93672dd3114383f30d877061de1d1683fa8bdda5309bfa2) diff --git a/src/scripts/versions.sh b/src/scripts/versions.sh index da15cc8..b5a3b81 100755 --- a/src/scripts/versions.sh +++ b/src/scripts/versions.sh @@ -23,7 +23,7 @@ PROJECT_VERSIONS[FREETYPE2]="2.14.3" PROJECT_VERSIONS[GCC]="15.2.0" PROJECT_VERSIONS[GTEST]="1.18.0" PROJECT_VERSIONS[GTKMM]="3.0" -PROJECT_VERSIONS[ICU]="78.3" +PROJECT_VERSIONS[ICU]="79.1" PROJECT_VERSIONS[INNOSETUP]="7.1.0" PROJECT_VERSIONS[INNOSETUP2]="7_1_0" PROJECT_VERSIONS[JSON]="3.12.0" diff --git a/support/3rd_party/icu_configure.sh b/support/3rd_party/icu_configure.sh index f5e9429..9892d13 100755 --- a/support/3rd_party/icu_configure.sh +++ b/support/3rd_party/icu_configure.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash -if ([ "$(uname -m)" == "arm64" ] || [ "$(uname -m)" == "aarch64" ]) && [ "${PROJECT_IS_ARM64}" == "0" ]; then +if ([ "$(uname -m)" == "arm64" ] || [ "$(uname -m)" == "aarch64" ]) && + [ "${PROJECT_IS_ARM64}" == "0" ]; then HOST_CFG="--host=x86_64-apple-darwin" - CLANG_BIN="$(xcrun -f clang)" - CLANGXX_BIN="$(xcrun -f clang++)" - export CC="${CLANG_BIN} -arch x86_64" - export CXX="${CLANGXX_BIN} -arch x86_64" + export CC="clang -arch x86_64" + export CXX="clang++ -arch x86_64" fi CXXFLAGS="-std=gnu++17 -march=$1 -mtune=generic" ./configure \ diff --git a/support/3rd_party/mingw64/icu-release-78.3.tar.gz.sha256 b/support/3rd_party/mingw64/icu-release-78.3.tar.gz.sha256 deleted file mode 100644 index 3d9a857..0000000 --- a/support/3rd_party/mingw64/icu-release-78.3.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -f06bcab72736ee9d55689033b8198a178562354128cf38edb2afc2e67e3fd931 icu-release-78.3.tar.gz diff --git a/support/3rd_party/mingw64/icu-release-79.1.tar.gz.sha256 b/support/3rd_party/mingw64/icu-release-79.1.tar.gz.sha256 new file mode 100644 index 0000000..6ba8419 --- /dev/null +++ b/support/3rd_party/mingw64/icu-release-79.1.tar.gz.sha256 @@ -0,0 +1 @@ +195b1dbb083321cc097e8cf88eca73de34fb41418f091748f7b6a829a4d40f1d icu-release-79.1.tar.gz