From 62898c7dff9d61119da8c5adc0f4fe5578bee253 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 22 Apr 2024 23:40:49 +0200 Subject: [PATCH] lua-language-server: 3.7.4 -> 3.8.0 --- lua-language-server/.footprint | 5 +- lua-language-server/.signature | 11 ++-- lua-language-server/Pkgfile | 4 +- lua-language-server/linux.ninja.patch | 79 --------------------------- 4 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 lua-language-server/linux.ninja.patch diff --git a/lua-language-server/.footprint b/lua-language-server/.footprint index e03fc8be5..5b293903f 100644 --- a/lua-language-server/.footprint +++ b/lua-language-server/.footprint @@ -26,7 +26,7 @@ drwxr-xr-x root/root usr/lib/lua-language-server/locale/zh-tw/ -rw-r--r-- root/root usr/lib/lua-language-server/locale/zh-tw/setting.lua -rw-r--r-- root/root usr/lib/lua-language-server/main.lua drwxr-xr-x root/root usr/lib/lua-language-server/meta/ -drwxr-xr-x root/root usr/lib/lua-language-server/meta/37cd34a3/ +drwxr-xr-x root/root usr/lib/lua-language-server/meta/3e0480e6/ drwxr-xr-x root/root usr/lib/lua-language-server/meta/3rd/ drwxr-xr-x root/root usr/lib/lua-language-server/meta/3rd/Cocos4.0/ drwxr-xr-x root/root usr/lib/lua-language-server/meta/3rd/Defold/ @@ -329,6 +329,7 @@ drwxr-xr-x root/root usr/lib/lua-language-server/script/cli/ -rw-r--r-- root/root usr/lib/lua-language-server/script/cli/doc2md.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/cli/init.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/cli/version.lua +-rw-r--r-- root/root usr/lib/lua-language-server/script/cli/visualize.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/client.lua drwxr-xr-x root/root usr/lib/lua-language-server/script/config/ -rw-r--r-- root/root usr/lib/lua-language-server/script/config/config.lua @@ -497,6 +498,7 @@ drwxr-xr-x root/root usr/lib/lua-language-server/script/parser/ -rw-r--r-- root/root usr/lib/lua-language-server/script/parser/tokens.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/plugin.lua drwxr-xr-x root/root usr/lib/lua-language-server/script/plugins/ +-rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/astHelper.lua drwxr-xr-x root/root usr/lib/lua-language-server/script/plugins/ffi/ drwxr-xr-x root/root usr/lib/lua-language-server/script/plugins/ffi/c-parser/ -rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/ffi/c-parser/c99.lua @@ -510,6 +512,7 @@ drwxr-xr-x root/root usr/lib/lua-language-server/script/plugins/ffi/c-parser/ -rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/ffi/init.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/ffi/searchCode.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/init.lua +-rw-r--r-- root/root usr/lib/lua-language-server/script/plugins/nodeHelper.lua -rw-r--r-- root/root usr/lib/lua-language-server/script/progress.lua drwxr-xr-x root/root usr/lib/lua-language-server/script/proto/ -rw-r--r-- root/root usr/lib/lua-language-server/script/proto/converter.lua diff --git a/lua-language-server/.signature b/lua-language-server/.signature index de4791d0a..e69d3e99c 100644 --- a/lua-language-server/.signature +++ b/lua-language-server/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39XP7sliZaKbJKCzRhFh6fp6EiaHVDS/mQpeHC5lBUNdtciaJHRAFCnUWMsfOYGXleesn9NuOnUhiEm62YNC0gc= -SHA256 (Pkgfile) = c9d108cdc36a02cb83ccbc0eaa0951dda55b073588cfdbef7ee16cbc9c83617f -SHA256 (.footprint) = 7ce001709f4a8a9c02418271ed019d752c0535eb2aecceaf997a224913dfa9d0 -SHA256 (lua-language-server-3.7.4.tar.gz) = 8d38ea649ed7e41da4b8005a6d0c1851814ec41550f1333e7f0b657f8c9da2b6 -SHA256 (lua-language-server-3.7.4-submodules.zip) = 4993365d2fd34ea460d5614927c752f27294181a6304901c3198a9defced673b -SHA256 (linux.ninja.patch) = 6004d3c6679c0bf5c4008aadd1d0649638acac06f92f2cbe54f1aeb9b8c2d9ee +RWSagIOpLGJF3wet1H3o/nfzvzuNWm4ovfIgRQmDRH3kdkz9UFYKLhz5FG2HZ9BJlrhnoLzLLXokcIOKmhI4/oVnZ+qAXAYOtA4= +SHA256 (Pkgfile) = 5e392abaa53411c58c66e41114d9b3d365c6be99ae17c00e8beb33a146eb60e1 +SHA256 (.footprint) = e2c2059b7393ca9b2e0bcf904a9bbb9dd53560a0effb8c4fd199a0e4af818734 +SHA256 (lua-language-server-3.8.0.tar.gz) = 24560683675d8653381212765ebb420e7058da94d2fd5dd8b1213337eca11dd8 +SHA256 (lua-language-server-3.8.0-submodules.zip) = 03f790d38680c494eece932f7191b5a4bc28dc8147dd332ed51fe46ebce8741c SHA256 (wrapper.sh) = c22dec148487ae1e170e460ab9c2de9ff06b8f0b4d19690913ccb4a0fb3bdd0e diff --git a/lua-language-server/Pkgfile b/lua-language-server/Pkgfile index f681432d2..58c546a51 100644 --- a/lua-language-server/Pkgfile +++ b/lua-language-server/Pkgfile @@ -4,11 +4,10 @@ # Depends on: lua name=lua-language-server -version=3.7.4 +version=3.8.0 release=1 source=(https://github.com/sumneko/lua-language-server/archive/$version/$name-$version.tar.gz https://github.com/sumneko/lua-language-server/releases/download/$version/lua-language-server-$version-submodules.zip - linux.ninja.patch wrapper.sh) build() { @@ -16,7 +15,6 @@ build() { cd $name-$version - patch -Np1 -i $SRC/linux.ninja.patch sed -i -e "s/^cc = REPLACE_ME/cc = cc/" \ -e "s/^ar = REPLACE_AR/ar = ar/" \ -e "s/CFLAGS/${CFLAGS}/" \ diff --git a/lua-language-server/linux.ninja.patch b/lua-language-server/linux.ninja.patch deleted file mode 100644 index c45d29051..000000000 --- a/lua-language-server/linux.ninja.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/3rd/luamake/compile/ninja/linux.ninja -+++ b/3rd/luamake/compile/ninja/linux.ninja -@@ -2,12 +2,12 @@ - builddir = build/linux - bin = $builddir/bin - obj = $builddir/obj --cc = gcc --ar = ar -+cc = REPLACE_ME -+ar = REPLACE_AR - luamake = luamake - rule c_source_bee - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -- -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -15,14 +15,14 @@ - bee.lua/3rd/lua-seri/lua-seri.c - rule cxx_source_bee - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d - build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc - rule cxx_source_bee_1 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -57,7 +57,7 @@ - rule cxx_source_bee_2 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $ -- -o $out -c $in -+ -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -80,14 +80,14 @@ - rule c_source_lua - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -- description = Compile C $out -+ description = Compile C $out CFLAGS - deps = gcc - depfile = $out.d - build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c - rule c_source_lua_1 - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $ - -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in -- description = Compile C $out -+ description = Compile C $out CFLAGS - deps = gcc - depfile = $out.d - build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c -@@ -95,7 +95,7 @@ - rule cxx_source_bootstrap - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -- -DNDEBUG -fPIC -o $out -c $in -+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -103,7 +103,7 @@ - bee.lua/bootstrap/main.cpp - rule link_bootstrap - command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $ -- -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s -+ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS - description = Link Exe $out - build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $