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
EasyRPG · Jan 3, 2025 · 8c38e2d · 8c38e2d
1 parent b1dbbe2
commit 8c38e2d
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 506 deletions.
diff --git a/3ds/2_build_toolchain.sh b/3ds/2_build_toolchain.sh
@@ -59,9 +59,10 @@ if [ ! -f .patches-applied ]; then
 	patch -d $LHASA_DIR -Np1 < $SCRIPT_DIR/../shared/extra/lhasa.patch
 
 	# Fix icu build
-	patch -Np0 < $SCRIPT_DIR/icu-3ds.patch
-	# Patch mutex support out
-	patch -Np0 < $SCRIPT_DIR/icu-3ds-no-mutex.patch
+	# Remove mutexes (crashes)
+	patch -Np0 < $SCRIPT_DIR/../shared/extra/icu-no-mutex.patch
+	# Fix char16 detection
+	patch -Np0 < $SCRIPT_DIR/icu-data-char16.patch
 
 	touch .patches-applied
 fi

diff --git a/3ds/icu-3ds.patch b/3ds/icu-3ds.patch
diff --git a/3ds/icu-data-char16.patch b/3ds/icu-data-char16.patch
@@ -0,0 +1,15 @@
+diff -Naur icu-orig/source/common/unicode/ptypes.h icu/source/common/unicode/ptypes.h
+--- icu-orig/source/common/unicode/ptypes.h	2024-08-26 18:27:25.490986142 +0200
++++ icu/source/common/unicode/ptypes.h	2024-08-26 18:27:44.527820067 +0200
+@@ -56,11 +56,7 @@
+ // implementations (looking at you, Apple, spring 2024) actually do this, so
+ // ICU4C must detect and deal with that.
+ #if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
+-#   if U_HAVE_CHAR16_T
+-#       include <uchar.h>
+-#   else
+         typedef uint16_t char16_t;
+-#   endif
+ #endif
+
+ #endif /* _PTYPES_H */
diff --git a/3ds/packages.sh b/3ds/packages.sh
diff --git a/shared/common.sh b/shared/common.sh
@@ -424,6 +424,8 @@ function patches_common {
 		chmod u+x configure
 		cp config/mh-linux config/mh-unknown
 		perl -pi -e 's/SMALL_BUFFER_MAX_SIZE 512/SMALL_BUFFER_MAX_SIZE 2048/' tools/toolutil/pkg_genc.h
+		# Disable icu components not required for encoding
+		perl -pi -e 's/LIBCPPFLAGS =/LIBCPPFLAGS = -DUCONFIG_ONLY_COLLATION/' config/mh-unknown
 	)
 }
 

diff --git a/3ds/icu-3ds-no-mutex.patch → shared/extra/icu-no-mutex.patch b/3ds/icu-3ds-no-mutex.patch → shared/extra/icu-no-mutex.patch
diff --git a/shared/packages.ini b/shared/packages.ini
@@ -150,7 +150,8 @@ url = "https://github.com/unicode-org/icu/releases/download/release-${version}/i
 directory = "icu"
 arguments = "--enable-strict=no --disable-tests --disable-samples
 	--disable-dyload --disable-extras --disable-icuio
-	--with-data-packaging=static --disable-layout --disable-layoutex"
+	--with-data-packaging=static --disable-layout --disable-layoutex
+	--enable-draft=no"
 anitya_id = 16134
 
 [icudata]

diff --git a/shared/packages.sh b/shared/packages.sh
@@ -98,7 +98,8 @@ ICU_URL="https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c
 ICU_DIR="icu"
 ICU_ARGS="--enable-strict=no --disable-tests --disable-samples \
 --disable-dyload --disable-extras --disable-icuio \
---with-data-packaging=static --disable-layout --disable-layoutex"
+--with-data-packaging=static --disable-layout --disable-layoutex \
+--enable-draft=no"
 
 ICUDATA_URL=https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata76_all.tar.gz
 ICUDATA_FILES="icudt*.dat"