Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lua-language-server: update to 3.6.24. #45228

Merged
merged 1 commit into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions srcpkgs/lua-language-server/patches/fix-musl.patch
Original file line number Diff line number Diff line change
@@ -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 <array>
#include <limits>
+#include <cstring>

// 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 <array>
#include <limits>
+#include <cstring>

// see the https://blogs.msdn.microsoft.com/commandline/2017/12/19/af_unix-comes-to-windows/
#if defined(_WIN32)

30 changes: 18 additions & 12 deletions srcpkgs/lua-language-server/patches/fix-stupid-broken-tests.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -55,4 +60,5 @@ index 5b85af7..cf653c0 100644
- end
- end
- checkOK()
end
-end

4 changes: 2 additions & 2 deletions srcpkgs/lua-language-server/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down