Skip to content

Commit 3050ed0

Browse files
GhabryGhabry
authored
Merge pull request #220 from EasyRPG/update/libraries
Automatic library update
2 parents e32c201 + f324918 commit 3050ed0

7 files changed

Lines changed: 79 additions & 16 deletions

File tree

‎emscripten/2_build_toolchain.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@ if [ ! -f .patches-applied ]; then
3636
# (see https://groups.google.com/forum/#!topic/emscripten-discuss/YM3jC_qQoPk)
3737
perl -pi -e 's/HAVE_ARC4RANDOM\)/NO_ARC4RANDOM\)/' $EXPAT_DIR/ConfigureChecks.cmake
3838

39+
# Fix ICU (Remove when 79.1 is released)
40+
(cd $ICU_DIR
41+
patch -Np2 < $SCRIPT_DIR/../shared/extra/icu-fix-data.patch
42+
)
43+
3944
if [ "$USE_WASM_SIMD" == "1" ]; then
4045
(cd $PIXMAN_DIR
41-
patch -Np2 < ../pixman-wasm.patch
46+
patch -Np2 < $SCRIPT_DIR/pixman-wasm.patch
4247
)
4348
fi
4449

‎ios/2_build_toolchain.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ if [ ! -f .patches-applied ]; then
2222

2323
patches_common
2424

25+
# Fix ICU (Remove when 79.1 is released)
26+
(cd $ICU_DIR
27+
patch -Np2 < $SCRIPT_DIR/../shared/extra/icu-fix-data.patch
28+
)
29+
2530
touch .patches-applied
2631
fi
2732

‎macos/2_build_toolchain.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ if [ ! -f .patches-applied ]; then
2222

2323
patches_common
2424

25+
# Fix ICU (Remove when 79.1 is released)
26+
(cd $ICU_DIR
27+
patch -Np2 < $SCRIPT_DIR/../shared/extra/icu-fix-data.patch
28+
)
29+
2530
touch .patches-applied
2631
fi
2732

‎shared/extra/icu-fix-data.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From aa17de1994d188560d99d07c37bf333416483899 Mon Sep 17 00:00:00 2001
2+
From: George Rhoten <grhoten@users.noreply.github.com>
3+
Date: Tue, 18 Nov 2025 15:47:24 -0800
4+
Subject: [PATCH] ICU-23263 Support shared/static data library that uses a
5+
pointer based table of contents
6+
7+
---
8+
icu4c/source/common/ucnv_io.cpp | 7 ++++---
9+
icu4c/source/configure | 2 +-
10+
icu4c/source/configure.ac | 2 +-
11+
3 files changed, 6 insertions(+), 5 deletions(-)
12+
13+
diff --git a/icu4c/source/common/ucnv_io.cpp b/icu4c/source/common/ucnv_io.cpp
14+
index 46a26f821fd8..66813f5a0372 100644
15+
--- a/icu4c/source/common/ucnv_io.cpp
16+
+++ b/icu4c/source/common/ucnv_io.cpp
17+
@@ -249,14 +249,15 @@ static void U_CALLCONV initAliasData(UErrorCode &errCode) {
18+
19+
sectionSizes = static_cast<const uint32_t*>(udata_getMemory(data));
20+
int32_t dataLength = udata_getLength(data); // This is the length minus the UDataInfo size
21+
- if (dataLength <= int32_t(sizeof(sectionSizes[0]))) {
22+
+ UBool isDataLengthKnown = dataLength >= 0; // Only false when using a pointer table of contents (not files nor a common data archive)
23+
+ if (isDataLengthKnown && dataLength <= int32_t(sizeof(sectionSizes[0]))) {
24+
// We don't even have a TOC!
25+
goto invalidFormat;
26+
}
27+
table = reinterpret_cast<const uint16_t*>(sectionSizes);
28+
tableStart = sectionSizes[0];
29+
sizeOfTOC = int32_t((tableStart + 1) * sizeof(sectionSizes[0]));
30+
- if (tableStart < minTocLength || dataLength <= sizeOfTOC) {
31+
+ if (tableStart < minTocLength || (isDataLengthKnown && dataLength <= sizeOfTOC)) {
32+
// We don't have a whole TOC!
33+
goto invalidFormat;
34+
}
35+
@@ -279,7 +280,7 @@ static void U_CALLCONV initAliasData(UErrorCode &errCode) {
36+
for (uint32_t section = 1; section <= tableStart; section++) {
37+
sizeOfData += sectionSizes[section] * sizeof(table[0]);
38+
}
39+
- if (dataLength < sizeOfData) {
40+
+ if (isDataLengthKnown && dataLength < sizeOfData) {
41+
// Truncated file!
42+
goto invalidFormat;
43+
}

‎shared/packages.ini‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ arguments = "-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATI
1111
anitya_id = 5303
1212

1313
[libpng]
14-
version = 1.6.55
14+
version = 1.6.58
1515
url = "https://download.sourceforge.net/libpng/libpng-${version}.tar.xz"
1616
arguments = "-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
1717
anitya_id = 1705
1818

1919
[freetype]
20-
version = 2.14.2
20+
version = 2.14.3
2121
url = "https://download.savannah.gnu.org/releases/freetype/freetype-${version}.tar.xz"
2222
arguments = "-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
2323
anitya_id = 854
2424

2525
[harfbuzz]
26-
version = 13.0.0
26+
version = 14.1.0
2727
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
2828
arguments = "-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled -Draster=disabled -Dvector=disabled -Dsubset=disabled"
2929
anitya_id = 1299
@@ -37,7 +37,7 @@ anitya_id = 3648
3737
[expat]
3838
version_major = 2
3939
version_minor = 7
40-
version_patch = 4
40+
version_patch = 5
4141
version = ${version_major}.${version_minor}.${version_patch}
4242
version_url = ${version_major}_${version_minor}_${version_patch}
4343
url = "https://github.com/libexpat/libexpat/releases/download/R_${version_url}/expat-${version}.tar.bz2"
@@ -146,7 +146,7 @@ url = "https://github.com/fragglet/lhasa/releases/download/v${version}/lhasa-${v
146146
anitya_id = 14822
147147

148148
[ICU]
149-
version = 78.2
149+
version = 78.3
150150
url = "https://github.com/unicode-org/icu/releases/download/release-${version}/icu4c-${version}-sources.tgz"
151151
directory = "icu"
152152
arguments = "--enable-strict=no --disable-tests --disable-samples
@@ -157,7 +157,7 @@ anitya_id = 379847
157157

158158
[icudata]
159159
version_major = 78
160-
version_minor = 2
160+
version_minor = 3
161161
version = ${version_major}.${version_minor}
162162
_ini_comment = empty on purpose, otherwise polluted by default section
163163
directory =

‎shared/packages.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ ZLIB_URL="https://zlib.net/fossils/zlib-1.3.2.tar.gz"
99
ZLIB_ARGS="-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
1010
ZLIB_DIR="zlib-1.3.2"
1111

12-
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.55.tar.xz"
12+
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.58.tar.xz"
1313
LIBPNG_ARGS="-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
14-
LIBPNG_DIR="libpng-1.6.55"
14+
LIBPNG_DIR="libpng-1.6.58"
1515

16-
FREETYPE_URL="https://download.savannah.gnu.org/releases/freetype/freetype-2.14.2.tar.xz"
16+
FREETYPE_URL="https://download.savannah.gnu.org/releases/freetype/freetype-2.14.3.tar.xz"
1717
FREETYPE_ARGS="-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
18-
FREETYPE_DIR="freetype-2.14.2"
18+
FREETYPE_DIR="freetype-2.14.3"
1919

20-
HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/13.0.0/harfbuzz-13.0.0.tar.xz"
20+
HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/14.1.0/harfbuzz-14.1.0.tar.xz"
2121
HARFBUZZ_ARGS="-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled -Draster=disabled -Dvector=disabled -Dsubset=disabled"
22-
HARFBUZZ_DIR="harfbuzz-13.0.0"
22+
HARFBUZZ_DIR="harfbuzz-14.1.0"
2323

2424
PIXMAN_URL="https://cairographics.org/releases/pixman-0.46.4.tar.gz"
2525
PIXMAN_ARGS="-Dtests=disabled -Ddemos=disabled -Dlibpng=disabled"
2626
PIXMAN_DIR="pixman-0.46.4"
2727

28-
EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.bz2"
28+
EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_5/expat-2.7.5.tar.bz2"
2929
EXPAT_ARGS="-DEXPAT_BUILD_TOOLS=OFF -DEXPAT_BUILD_EXAMPLES=OFF \
3030
-DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_DOCS=OFF -DEXPAT_SHARED_LIBS=OFF"
31-
EXPAT_DIR="expat-2.7.4"
31+
EXPAT_DIR="expat-2.7.5"
3232

3333
LIBOGG_URL="https://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.xz"
3434
LIBOGG_DIR="libogg-1.3.6"
@@ -95,7 +95,7 @@ INIH_DIR="inih-r62"
9595
LHASA_URL="https://github.com/fragglet/lhasa/releases/download/v0.5.0/lhasa-0.5.0.tar.gz"
9696
LHASA_DIR="lhasa-0.5.0"
9797

98-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
98+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.3/icu4c-78.3-sources.tgz"
9999
ICU_DIR="icu"
100100
ICU_ARGS="--enable-strict=no --disable-tests --disable-samples \
101101
--disable-dyload --disable-extras --disable-icuio \

‎tvos/2_build_toolchain.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ if [ ! -f .patches-applied ]; then
2222

2323
patches_common
2424

25+
# Fix ICU (Remove when 79.1 is released)
26+
(cd $ICU_DIR
27+
patch -Np2 < $SCRIPT_DIR/../shared/extra/icu-fix-data.patch
28+
)
29+
2530
touch .patches-applied
2631
fi
2732

0 commit comments

Comments
 (0)