Browse Source

include unicode patch in lua meson wrap (#1908)

pull/1860/merge
Jan 9 months ago
committed by GitHub
parent
commit
efa257ddbd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      .github/workflows/build.yml
  2. 2
      meson.build
  3. 1
      resources/README.md
  4. 4
      scripts/build.sh
  5. 1
      subprojects/lua.wrap
  6. 0
      subprojects/packagefiles/lua/lua-unicode.diff

1
.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

2
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'
]

1
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

4
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 \

1
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

0
resources/windows/001-lua-unicode.diff → subprojects/packagefiles/lua/lua-unicode.diff

Loading…
Cancel
Save