Skip to content

Commit fab57be

Browse files
committed
WiiU & 3DS: Use ICU 76 again
Disable non-encoding ICU features (UCONFIG_ONLY_COLLATION) for non-desktop platforms. Not needed and reduces the amount of patching required. Fix Wii mutex patch Fix VitaSDK finding system libraries
1 parent 21a1d0f commit fab57be

File tree

13 files changed

+37
-506
lines changed

13 files changed

+37
-506
lines changed

3ds/2_build_toolchain.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ if [ ! -f .patches-applied ]; then
5959
patch -d $LHASA_DIR -Np1 < $SCRIPT_DIR/../shared/extra/lhasa.patch
6060

6161
# Fix icu build
62-
patch -Np0 < $SCRIPT_DIR/icu-3ds.patch
63-
# Patch mutex support out
64-
patch -Np0 < $SCRIPT_DIR/icu-3ds-no-mutex.patch
62+
# Remove mutexes (crashes)
63+
patch -Np0 < $SCRIPT_DIR/../shared/extra/icu-no-mutex.patch
64+
# Fix char16 detection
65+
patch -Np0 < $SCRIPT_DIR/icu-data-char16.patch
6566

6667
touch .patches-applied
6768
fi

3ds/icu-3ds.patch

Lines changed: 0 additions & 325 deletions
This file was deleted.

3ds/icu-data-char16.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff -Naur icu-orig/source/common/unicode/ptypes.h icu/source/common/unicode/ptypes.h
2+
--- icu-orig/source/common/unicode/ptypes.h 2024-08-26 18:27:25.490986142 +0200
3+
+++ icu/source/common/unicode/ptypes.h 2024-08-26 18:27:44.527820067 +0200
4+
@@ -56,11 +56,7 @@
5+
// implementations (looking at you, Apple, spring 2024) actually do this, so
6+
// ICU4C must detect and deal with that.
7+
#if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
8+
-# if U_HAVE_CHAR16_T
9+
-# include <uchar.h>
10+
-# else
11+
typedef uint16_t char16_t;
12+
-# endif
13+
#endif
14+
15+
#endif /* _PTYPES_H */

3ds/packages.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

shared/common.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,8 @@ function patches_common {
424424
chmod u+x configure
425425
cp config/mh-linux config/mh-unknown
426426
perl -pi -e 's/SMALL_BUFFER_MAX_SIZE 512/SMALL_BUFFER_MAX_SIZE 2048/' tools/toolutil/pkg_genc.h
427+
# Disable icu components not required for encoding
428+
perl -pi -e 's/LIBCPPFLAGS =/LIBCPPFLAGS = -DUCONFIG_ONLY_COLLATION/' config/mh-unknown
427429
)
428430
}
429431

shared/packages.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ url = "https://github.com/unicode-org/icu/releases/download/release-${version}/i
150150
directory = "icu"
151151
arguments = "--enable-strict=no --disable-tests --disable-samples
152152
--disable-dyload --disable-extras --disable-icuio
153-
--with-data-packaging=static --disable-layout --disable-layoutex"
153+
--with-data-packaging=static --disable-layout --disable-layoutex
154+
--enable-draft=no"
154155
anitya_id = 16134
155156

156157
[icudata]

shared/packages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ ICU_URL="https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c
9898
ICU_DIR="icu"
9999
ICU_ARGS="--enable-strict=no --disable-tests --disable-samples \
100100
--disable-dyload --disable-extras --disable-icuio \
101-
--with-data-packaging=static --disable-layout --disable-layoutex"
101+
--with-data-packaging=static --disable-layout --disable-layoutex \
102+
--enable-draft=no"
102103

103104
ICUDATA_URL=https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata76_all.tar.gz
104105
ICUDATA_FILES="icudt*.dat"

0 commit comments

Comments
 (0)