3ds, Wii, Wiiu: Fix ICU 75 build

Author: Ghabry

3ds/2_build_toolchain.sh

@@ -52,9 +52,6 @@ if [ ! -f .patches-applied ]; then
 	# Fix tremor
 	patch -d $TREMOR_DIR -Np1 < $SCRIPT_DIR/tremor-fix-types.patch
 
-	# Fix opus (remove when next version is out)
-	patch -d $OPUS_DIR -Np1 < $SCRIPT_DIR/opus-fix-types.patch
-
 	# Fix opusfile
 	patch -d $OPUSFILE_DIR -Np1 < $SCRIPT_DIR/../shared/extra/opusfile-devkit.patch
 

3ds/icu-3ds.patch

@@ -303,3 +303,23 @@
      return countOfItemsToEvict;
  }
 
+--- icu-native/source/i18n/persncal.cpp	2024-08-26 18:45:32.573623303 +0200
++++ icu/source/i18n/persncal.cpp	2024-08-26 18:45:43.337048627 +0200
+@@ -179,7 +179,7 @@
+         }
+     }
+ 
+-    int64_t julianDay = PERSIAN_EPOCH - 1LL + 365LL * (eyear - 1LL) + ClockMath::floorDivide(8LL * eyear + 21, 33);
++    int64_t julianDay = PERSIAN_EPOCH - 1LL + 365LL * (eyear - 1LL) + ClockMath::floorDivide(8 * eyear + 21, 33);
+ 
+     if (month != 0) {
+         julianDay += kPersianNumDays[month];
+@@ -225,7 +225,7 @@
+         return;
+     }
+ 
+-    int64_t farvardin1 = 365LL * (year - 1) + ClockMath::floorDivide(8LL * year + 21, 33);
++    int64_t farvardin1 = 365LL * (year - 1) + ClockMath::floorDivide((int32_t)(8 * year + 21), 33);
+     int32_t dayOfYear = daysSinceEpoch - farvardin1; // 0-based
+     U_ASSERT(dayOfYear >= 0);
+     U_ASSERT(dayOfYear < 366);

3ds/opus-fix-types.patch

@@ -52,6 +52,8 @@ if [ ! -f .patches-applied ]; then
 	patch -Np0 < icu-pkg_genc.patch
 	# Patch mutex support in
 	patch -Np0 < icu-wii-mutex.patch
+	# Fix building data file without assembly
+	patch -Np0 < icu-data-char16.patch
 
 	touch .patches-applied
 fi

wii/2_build_toolchain.sh

@@ -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 */

wii/icu-data-char16.patch

@@ -46,6 +46,8 @@ if [ ! -f .patches-applied ]; then
 	perl -pi -e 's|#ifndef U_DISABLE_OBJ_CODE.*|#if 0 // U_DISABLE_OBJ_CODE|' icu/source/tools/toolutil/pkg_genc.h
 	# Emit correct bigendian icudata header
 	patch -Np0 < icu-pkg_genc.patch
+	# Fix building data file without assembly
+	patch -Np0 < icu-data-char16.patch
 
 	touch .patches-applied
 fi

wiiu/2_build_toolchain.sh

@@ -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 */