From 1ed8f646087ddc688095cb69e7e93fb86c458b78 Mon Sep 17 00:00:00 2001 From: Takase <20792268+takase1121@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:23:50 +0800 Subject: [PATCH] Revert "feat(subprojects): update wraps (#1577)" This reverts commit a97de87d869c227c2d41595d76ecafdc29e76bef. --- .github/workflows/build.yml | 2 +- meson.build | 17 ++--------------- resources/include/lite_xl_plugin_api.h | 12 +----------- subprojects/freetype2.wrap | 11 +++++------ subprojects/lua.wrap | 18 ++++++++---------- subprojects/pcre2.wrap | 11 +++++------ subprojects/sdl2.wrap | 19 ++++++++----------- 7 files changed, 30 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21f3a8b4..96db355f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,7 +204,7 @@ jobs: run: | "INSTALL_NAME=lite-xl-$($env:GITHUB_REF -replace ".*/")-windows-msvc-${{ matrix.arch.name }}" >> $env:GITHUB_ENV "INSTALL_REF=$($env:GITHUB_REF -replace ".*/")" >> $env:GITHUB_ENV - "LUA_SUBPROJECT_PATH=subprojects/$(awk -F ' *= *' '/directory/ { printf $2 }' subprojects/lua.wrap)" >> $env:GITHUB_ENV + "LUA_SUBPROJECT_PATH=subprojects/lua-5.4.4" >> $env:GITHUB_ENV - name: Download and patch subprojects shell: bash run: | diff --git a/meson.build b/meson.build index f0614cc8..3cfec808 100644 --- a/meson.build +++ b/meson.build @@ -101,7 +101,7 @@ if not get_option('source-only') endforeach else lua_dep = dependency('', fallback: ['lua', 'lua_dep'], required : true, - default_options: default_fallback_options + ['default_library=static', 'line_editing=disabled', 'interpreter=false'] + default_options: default_fallback_options + ['default_library=static', 'line_editing=false', 'interpreter=false'] ) endif @@ -123,7 +123,6 @@ if not get_option('source-only') sdl_options += 'use_atomic=enabled' sdl_options += 'use_threads=enabled' sdl_options += 'use_timers=enabled' - sdl_options += 'with_main=true' # investigate if this is truly needed # Do not remove before https://github.com/libsdl-org/SDL/issues/5413 is released sdl_options += 'use_events=enabled' @@ -156,24 +155,12 @@ if not get_option('source-only') sdl_options += 'use_video_vulkan=disabled' sdl_options += 'use_video_offscreen=disabled' sdl_options += 'use_power=disabled' - sdl_options += 'system_iconv=disabled' sdl_dep = dependency('sdl2', fallback: ['sdl2', 'sdl2_dep'], default_options: default_fallback_options + sdl_options ) - if host_machine.system() == 'windows' - if sdl_dep.type_name() == 'internal' - sdlmain_dep = dependency('sdl2main', fallback: ['sdl2main_dep']) - else - sdlmain_dep = cc.find_library('SDL2main') - endif - else - sdlmain_dep = dependency('', required: false) - assert(not sdlmain_dep.found(), 'checking if fake dependency has been found') - endif - - lite_deps = [lua_dep, sdl_dep, sdlmain_dep, freetype_dep, pcre2_dep, libm, libdl] + lite_deps = [lua_dep, sdl_dep, freetype_dep, pcre2_dep, libm, libdl] endif #=============================================================================== # Install Configuration diff --git a/resources/include/lite_xl_plugin_api.h b/resources/include/lite_xl_plugin_api.h index 0f500059..0c5e93e9 100644 --- a/resources/include/lite_xl_plugin_api.h +++ b/resources/include/lite_xl_plugin_api.h @@ -31,14 +31,9 @@ * An example command would be: gcc -shared -o xxxxx.so xxxxx.c * You must not link to ANY lua library to avoid symbol collision. * - * This file contains stock configuration for a typical installation of Lua 5.4.6. + * This file contains stock configuration for a typical installation of Lua 5.4. * DO NOT MODIFY ANYTHING. MODIFYING STUFFS IN HERE WILL BREAK * COMPATIBILITY WITH LITE XL AND CAUSE UNDEBUGGABLE BUGS. - * - * For reference, here are a list of permalinks to previous version of this file that targets an older version of Lua. - * If you don't need functionalities offered by the new version, use the OLDEST FILE for backwards compatibility. - * - * - Lua 5.4.4: https://github.com/lite-xl/lite-xl/blob/397973067f14420b26e3b20a238a50016c0b75e2/resources/include/lite_xl_plugin_api.h **/ #ifndef LITE_XL_PLUGIN_API #define LITE_XL_PLUGIN_API @@ -1033,7 +1028,6 @@ extern const char lua_ident[]; SYMBOL_DECLARE(lua_State *, lua_newstate, lua_Alloc f, void *ud) SYMBOL_DECLARE(void, lua_close, lua_State *L) SYMBOL_DECLARE(lua_State *, lua_newthread, lua_State *L) -SYMBOL_DECLARE(int, lua_closethread, lua_State *L, lua_State *from) SYMBOL_DECLARE(int, lua_resetthread, lua_State *L) SYMBOL_DECLARE(lua_CFunction, lua_atpanic, lua_State *L, lua_CFunction panicf) @@ -1745,9 +1739,6 @@ SYMBOL_WRAP_DECL(void, lua_close, lua_State *L) { SYMBOL_WRAP_DECL(lua_State *, lua_newthread, lua_State *L) { return SYMBOL_WRAP_CALL(lua_newthread, L); } -SYMBOL_WRAP_DECL(int, lua_closethread, lua_State *L, lua_State *from) { - return SYMBOL_WRAP_CALL(lua_closethread, L, from); -} SYMBOL_WRAP_DECL(int, lua_resetthread, lua_State *L) { return SYMBOL_WRAP_CALL(lua_resetthread, L); } @@ -2360,7 +2351,6 @@ void lite_xl_plugin_init(void *XL) { IMPORT_SYMBOL(lua_newstate, lua_State *, lua_Alloc f, void *ud); IMPORT_SYMBOL(lua_close, void, lua_State *L); IMPORT_SYMBOL(lua_newthread, lua_State *, lua_State *L); - IMPORT_SYMBOL(lua_closethread, int, lua_State *L, lua_State *from); IMPORT_SYMBOL(lua_resetthread, int, lua_State *L); IMPORT_SYMBOL(lua_atpanic, lua_CFunction, lua_State *L, lua_CFunction panicf); IMPORT_SYMBOL(lua_version, lua_Number, lua_State *L); diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index e3554c9a..1ff89ecd 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,10 +1,9 @@ [wrap-file] -directory = freetype-2.13.2 -source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.2-1/freetype-2.13.2.tar.xz -source_filename = freetype-2.13.2.tar.xz -source_hash = 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d -wrapdb_version = 2.13.2-1 +directory = freetype-2.12.1 +source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.xz +source_filename = freetype-2.12.1.tar.xz +source_hash = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f +wrapdb_version = 2.12.1-2 [provide] freetype2 = freetype_dep diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap index 16502616..5a2d615b 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -1,14 +1,12 @@ [wrap-file] -directory = lua-5.4.6 -source_url = https://www.lua.org/ftp/lua-5.4.6.tar.gz -source_filename = lua-5.4.6.tar.gz -source_hash = 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 -patch_filename = lua_5.4.6-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.6-3/get_patch -patch_hash = 9b72a95422fd47f79f969d9abdb589ee95712d5512a5246f94e7e4f63d2cb7b7 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/lua_5.4.6-3/lua-5.4.6.tar.gz -wrapdb_version = 5.4.6-3 +directory = lua-5.4.4 +source_url = https://www.lua.org/ftp/lua-5.4.4.tar.gz +source_filename = lua-5.4.4.tar.gz +source_hash = 164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 +patch_filename = lua_5.4.4-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.4-1/get_patch +patch_hash = e61cd965c629d6543176f41a9f1cb9050edfd1566cf00ce768ff211086e40bdc [provide] lua-5.4 = lua_dep -lua = lua_dep + diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap index 6bfef6f3..8fada34e 100644 --- a/subprojects/pcre2.wrap +++ b/subprojects/pcre2.wrap @@ -1,13 +1,12 @@ [wrap-file] directory = pcre2-10.42 -source_url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 +source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 source_filename = pcre2-10.42.tar.bz2 source_hash = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 -patch_filename = pcre2_10.42-5_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.42-5/get_patch -patch_hash = 7ba1730a3786c46f41735658a9884b09bc592af3840716e0ccc552e7ddf5630c -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pcre2_10.42-5/pcre2-10.42.tar.bz2 -wrapdb_version = 10.42-5 +patch_filename = pcre2_10.42-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.42-1/get_patch +patch_hash = 06969e916dfee663c189810df57d98574f15e0754a44cd93f3f0bc7234b05d89 +wrapdb_version = 10.42-1 [provide] libpcre2-8 = libpcre2_8 diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap index 14c18533..53a71e2f 100644 --- a/subprojects/sdl2.wrap +++ b/subprojects/sdl2.wrap @@ -1,15 +1,12 @@ [wrap-file] -directory = SDL2-2.28.1 -source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz -source_filename = SDL2-2.28.1.tar.gz -source_hash = 4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d -patch_filename = sdl2_2.28.1-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.28.1-2/get_patch -patch_hash = 2dd332226ba2a4373c6d4eb29fa915e9d5414cf7bb9fa2e4a5ef3b16a06e2736 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.28.1-2/SDL2-2.28.1.tar.gz -wrapdb_version = 2.28.1-2 +directory = SDL2-2.26.0 +source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.26.0/SDL2-2.26.0.tar.gz +source_filename = SDL2-2.26.0.tar.gz +source_hash = 8000d7169febce93c84b6bdf376631f8179132fd69f7015d4dadb8b9c2bdb295 +patch_filename = sdl2_2.26.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.26.0-1/get_patch +patch_hash = 6fcfd727d71cf7837332723518d5e47ffd64f1e7630681cf4b50e99f2bf7676f +wrapdb_version = 2.26.0-1 [provide] sdl2 = sdl2_dep -sdl2main = sdl2main_dep -sdl2_test = sdl2_test_dep