From 54ab1e044cd625af74634eae4796b9607b76e9b3 Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 22 Jul 2023 12:39:31 +0530 Subject: [PATCH] lua-language-server: update to 3.6.24. --- .../patches/fix-musl.patch | 22 ++++++++++++++ .../patches/fix-stupid-broken-tests.patch | 30 +++++++++++-------- srcpkgs/lua-language-server/template | 4 +-- 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/lua-language-server/patches/fix-musl.patch diff --git a/srcpkgs/lua-language-server/patches/fix-musl.patch b/srcpkgs/lua-language-server/patches/fix-musl.patch new file mode 100644 index 0000000000000..a024862aaa4bb --- /dev/null +++ b/srcpkgs/lua-language-server/patches/fix-musl.patch @@ -0,0 +1,22 @@ +--- a/3rd/bee.lua/bee/net/endpoint.cpp ++++ b/3rd/bee.lua/bee/net/endpoint.cpp +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + // see the https://blogs.msdn.microsoft.com/commandline/2017/12/19/af_unix-comes-to-windows/ + #if defined(_WIN32) + +--- a/3rd/luamake/bee.lua/bee/net/endpoint.cpp ++++ b/3rd/luamake/bee.lua/bee/net/endpoint.cpp +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + // see the https://blogs.msdn.microsoft.com/commandline/2017/12/19/af_unix-comes-to-windows/ + #if defined(_WIN32) + diff --git a/srcpkgs/lua-language-server/patches/fix-stupid-broken-tests.patch b/srcpkgs/lua-language-server/patches/fix-stupid-broken-tests.patch index 04447cb981ef6..1ead008303f96 100644 --- a/srcpkgs/lua-language-server/patches/fix-stupid-broken-tests.patch +++ b/srcpkgs/lua-language-server/patches/fix-stupid-broken-tests.patch @@ -12,16 +12,18 @@ diff --git a/3rd/bee.lua/test/test_lua.lua b/3rd/bee.lua/test/test_lua.lua index 5b85af7..cf653c0 100644 --- a/3rd/bee.lua/test/test_lua.lua +++ b/3rd/bee.lua/test/test_lua.lua -@@ -21,19 +21,4 @@ function test_lua:test_stack_overflow_2() +@@ -21,21 +21,3 @@ + print(t[1]) + end) end - - function test_lua:test_next() +- +-function test_lua:test_next() - local t = {} - for i = 1, 26 do -- t[string.char(0x40+i)] = true +- t[string.char(0x40 + i)] = true - end - local expected = { -- 'Z', 'Y', 'V', 'U', 'X', 'W', 'R', 'Q', 'T', 'S', 'N', 'M', 'P', 'O', 'J', 'I', 'L', 'K', 'F', 'E', 'H', 'G', 'B', 'A', 'D', 'C' +- "Z", "Y", "V", "U", "X", "W", "R", "Q", "T", "S", "N", "M", "P", "O", "J", "I", "L", "K", "F", "E", "H", "G", "B", "A", "D", "C" - } - local function checkOK() - local key @@ -31,21 +33,24 @@ index 5b85af7..cf653c0 100644 - end - end - checkOK() - end +-end + diff --git a/3rd/luamake/bee.lua/test/test_lua.lua b/3rd/luamake/bee.lua/test/test_lua.lua index 5b85af7..cf653c0 100644 --- a/3rd/luamake/bee.lua/test/test_lua.lua +++ b/3rd/luamake/bee.lua/test/test_lua.lua -@@ -21,19 +21,4 @@ function test_lua:test_stack_overflow_2() +@@ -21,21 +21,3 @@ + print(t[1]) + end) end - - function test_lua:test_next() +- +-function test_lua:test_next() - local t = {} - for i = 1, 26 do -- t[string.char(0x40+i)] = true +- t[string.char(0x40 + i)] = true - end - local expected = { -- 'Z', 'Y', 'V', 'U', 'X', 'W', 'R', 'Q', 'T', 'S', 'N', 'M', 'P', 'O', 'J', 'I', 'L', 'K', 'F', 'E', 'H', 'G', 'B', 'A', 'D', 'C' +- "Z", "Y", "V", "U", "X", "W", "R", "Q", "T", "S", "N", "M", "P", "O", "J", "I", "L", "K", "F", "E", "H", "G", "B", "A", "D", "C" - } - local function checkOK() - local key @@ -55,4 +60,5 @@ index 5b85af7..cf653c0 100644 - end - end - checkOK() - end +-end + diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template index 1b1d577ebefc4..c2afb9805e528 100644 --- a/srcpkgs/lua-language-server/template +++ b/srcpkgs/lua-language-server/template @@ -1,6 +1,6 @@ # Template file for 'lua-language-server' pkgname=lua-language-server -version=3.6.23 +version=3.6.24 revision=1 hostmakedepends="ninja" short_desc="Lua LSP implementation written in Lua" @@ -9,7 +9,7 @@ license="MIT" homepage="https://github.com/LuaLS/lua-language-server" changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md" distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip" -checksum=039de8c34b8d9db0bc350e19391e4e437b362b7d2016fde9bc3ff3588e6787cb +checksum=c85ec17eab50007a367656e84b1ad0de517dd14b397c83b252e2e1b9acee05b4 do_build() { ninja -C 3rd/luamake -f compile/ninja/linux.ninja