From efa257ddbdd9ade1cad588918c62f091493ccb1b Mon Sep 17 00:00:00 2001
From: Jan <sentrycraft123@gmail.com>
Date: Tue, 22 Oct 2024 19:19:42 +0200
Subject: [PATCH] include unicode patch in lua meson wrap (#1908)

---
 .github/workflows/build.yml                                   | 1 -
 meson.build                                                   | 2 +-
 resources/README.md                                           | 1 -
 scripts/build.sh                                              | 4 ----
 subprojects/lua.wrap                                          | 1 +
 .../packagefiles/lua/lua-unicode.diff                         | 0
 6 files changed, 2 insertions(+), 7 deletions(-)
 rename resources/windows/001-lua-unicode.diff => subprojects/packagefiles/lua/lua-unicode.diff (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac6b6380..dcf97f0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -230,7 +230,6 @@ jobs:
         shell: bash
         run: |
           meson subprojects download
-          cat resources/windows/001-lua-unicode.diff | patch -Np1 -d "$LUA_SUBPROJECT_PATH"
 
       - name: Configure
         run: meson setup --wrap-mode=forcefallback build
diff --git a/meson.build b/meson.build
index 9c3e0f3e..93fe8fa2 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('lite-xl',
     ['c'],
     version : '2.1.5',
     license : 'MIT',
-    meson_version : '>= 0.56',
+    meson_version : '>= 0.63',
     default_options : [
         'c_std=gnu11'
     ]
diff --git a/resources/README.md b/resources/README.md
index 077cbb86..0e675d86 100644
--- a/resources/README.md
+++ b/resources/README.md
@@ -17,7 +17,6 @@ This folder contains resources that is used for building or packaging the projec
 - `macos/background.tiff`: TIFF image for packaging macOS DMGs.
 - `macos/Info.plist.in`: Template for generating `info.plist` on macOS. See `macos/macos-retina-display.md` for details.
 - `macos/lite-xl-dmg.py`: Configuration options for dmgbuild for packaging macOS DMGs.
-- `windows/001-lua-unicode.diff`: Patch for allowing Lua to load files with UTF-8 filenames on Windows.
 
 ### Development
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 10bb4ca6..62873978 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -192,10 +192,6 @@ main() {
     # download the subprojects so we can start patching before configure.
     # this will prevent reconfiguring the project.
     meson subprojects download
-    lua_subproject_path="subprojects/$(awk -F ' *= *' '/directory/ { printf $2 }' subprojects/lua.wrap)"
-    if [[ -d $lua_subproject_path ]]; then
-      patch -d $lua_subproject_path -p1 --forward < resources/windows/001-lua-unicode.diff
-    fi
   fi
 
   CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS meson setup \
diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap
index a1ffdaf3..b186f2cf 100644
--- a/subprojects/lua.wrap
+++ b/subprojects/lua.wrap
@@ -8,6 +8,7 @@ patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.6-4/get_patch
 patch_hash = b5a8c9b3673fbe58afaf842041bc9551f1f742c363fd3be8d47db2e6a483b54c
 source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/lua_5.4.6-4/lua-5.4.6.tar.gz
 wrapdb_version = 5.4.6-4
+diff_files = lua/lua-unicode.diff
 
 [provide]
 lua-5.4 = lua_dep
diff --git a/resources/windows/001-lua-unicode.diff b/subprojects/packagefiles/lua/lua-unicode.diff
similarity index 100%
rename from resources/windows/001-lua-unicode.diff
rename to subprojects/packagefiles/lua/lua-unicode.diff