Merge pull request #188 from Ghabry/updates

Package Updates
EasyRPG · Jan 4, 2025 · 9d47d69 · 9d47d69
2 parents 94e64ae + 392af27
commit 9d47d69
Show file tree

Hide file tree

Showing 20 changed files with 154 additions and 586 deletions.
diff --git a/.github/workflows/stable-compilation.yml b/.github/workflows/stable-compilation.yml
@@ -41,7 +41,9 @@ jobs:
           apt-get install -yqq --no-install-recommends --no-install-suggests \
             ca-certificates build-essential cmake ninja-build meson git \
             autoconf autoconf-archive automake autotools-dev libtool \
-            sed gawk patch perl pkg-config curl unzip libpulse-dev
+            sed gawk patch perl pkg-config curl unzip libpulse-dev python3-pip
+          pip3 config set global.break-system-packages true
+          pip3 install --upgrade meson
 
       - name: Clone Repository
         uses: actions/checkout@v4

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/emscripten/1_download_library.sh b/emscripten/1_download_library.sh
@@ -43,8 +43,8 @@ else
 	touch .emscripten
 
 	# Download and install the latest SDK tools and set up the compiler configuration to point to it.
-	./emsdk install 3.1.65
-	./emsdk activate 3.1.65
+	./emsdk install 3.1.74
+	./emsdk activate 3.1.74
 
 	# Set the current Emscripten path
 	source ./emsdk_env.sh