From ee98eb82f75727acc6f06179940537a5ccc41891 Mon Sep 17 00:00:00 2001 From: Mathis Winterer Date: Wed, 1 Feb 2023 13:15:17 +0100 Subject: [PATCH] dev-util/lua-language-server: add 3.6.8, drop 3.6.7 Signed-off-by: Mathis Winterer --- dev-util/lua-language-server/Manifest | 2 +- .../files/build.ninja.patch | 75 ++++++------------- .../files/linux.ninja.patch | 44 ++++++----- ...build => lua-language-server-3.6.8.ebuild} | 0 4 files changed, 49 insertions(+), 72 deletions(-) rename dev-util/lua-language-server/{lua-language-server-3.6.7.ebuild => lua-language-server-3.6.8.ebuild} (100%) diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest index 4bf23c8109..7967eaa88e 100644 --- a/dev-util/lua-language-server/Manifest +++ b/dev-util/lua-language-server/Manifest @@ -1 +1 @@ -DIST lua-language-server-3.6.7.zip 32326158 BLAKE2B 9a83a23c280cd4610396ac67501d19f557dd5d5eb8018a5a48a01c6f699d9e6ad90f87cb9eabd605c921793e5cd3625a67069a792813a2e562a8a0693344d112 SHA512 033f352581dd2f94bf5df13e1ba861e15dc75246e9bf4668700cc700d98e82ebc3593b8f0fcbcd69dbef472fd6dbb84704d8a0068832832c3241a824ca9dca51 +DIST lua-language-server-3.6.8.zip 389244327 BLAKE2B 67299716586bd01f2fc48319b68319b48090b87d8f4c72b79c52022af39140490983edfd1145d88616c1fabcb7f6a62bed8defbab7a8f4fe3330176812994a58 SHA512 bf5633e7570fa44d62bb5a2e4414d4f0e197fcef3b1a9876ea90cf37a79ae17afaaecdc5d54917cc7fb44e01b7db34abd6329cef0df4e3207177a0a6a8ec54f2 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index 3760f93676..11db385d3d 100644 --- a/dev-util/lua-language-server/files/build.ninja.patch +++ b/dev-util/lua-language-server/files/build.ninja.patch @@ -1,6 +1,6 @@ --- a/build/build.ninja +++ b/build/build.ninja -@@ -12,17 +12,17 @@ +@@ -12,18 +12,18 @@ 3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $ make/code_format.lua rule c_source_bee @@ -15,37 +15,40 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $ 3rd/bee.lua/3rd/lua-seri/lua-seri.c rule cxx_source_bee -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -- -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ -+ -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $ +- $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $ ++ $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -30,8 +30,8 @@ +@@ -31,8 +31,8 @@ 3rd/bee.lua/bee/nonstd/fmt/format.cc build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc rule cxx_source_bee_1 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -55,9 +55,9 @@ +@@ -56,9 +56,9 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $ 3rd/bee.lua/bee/utility/path_helper.cpp rule cxx_source_bee_2 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ - -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ + -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -78,26 +78,26 @@ +@@ -79,26 +79,26 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ 3rd/bee.lua/binding/lua_time.cpp rule c_source_lua @@ -71,15 +74,16 @@ build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c rule cxx_source_bootstrap -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $ -- -DNDEBUG -fPIC -o $out -c $in -+ -DNDEBUG -o $out -c $in CXXFLAGS +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ +- -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ ++ -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ 3rd/bee.lua/bootstrap/progdir.cpp rule link_bootstrap command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $ @@ -88,34 +92,3 @@ description = Link Exe $out build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ -@@ -145,10 +145,10 @@ - 3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $ - /bootstrap copy_script - rule cxx_code_format -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $ - -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $ -- -DNDEBUG -Wall -Werror -o $out -c $in -+ -DNDEBUG -Wall -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -273,7 +273,7 @@ - build $obj/code_format/Utf8.obj: cxx_code_format $ - 3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp - rule c_lpeglabel -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $ - -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $ - -o $out -c $in - description = Compile C $out -@@ -285,7 +285,7 @@ - build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c - build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c - rule cxx_lua_language_server -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $ - -DNDEBUG -o $out -c $in - description = Compile C++ $out diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch index a16055fd77..3be7fba754 100644 --- a/dev-util/lua-language-server/files/linux.ninja.patch +++ b/dev-util/lua-language-server/files/linux.ninja.patch @@ -1,6 +1,6 @@ --- a/3rd/luamake/compile/ninja/linux.ninja +++ b/3rd/luamake/compile/ninja/linux.ninja -@@ -2,20 +2,20 @@ +@@ -2,21 +2,21 @@ builddir = build/linux bin = $builddir/bin obj = $builddir/obj @@ -19,37 +19,40 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $ 3rd/bee.lua/3rd/lua-seri/lua-seri.c rule cxx_source_bee -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -- -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ -+ -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $ +- $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $ ++ $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -23,8 +23,8 @@ +@@ -24,8 +24,8 @@ 3rd/bee.lua/bee/nonstd/fmt/format.cc build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc rule cxx_source_bee_1 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -48,9 +48,9 @@ +@@ -49,9 +49,9 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $ 3rd/bee.lua/bee/utility/path_helper.cpp rule cxx_source_bee_2 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ - -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ + -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -71,25 +71,25 @@ +@@ -72,25 +72,25 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ 3rd/bee.lua/binding/lua_time.cpp rule c_source_lua @@ -73,15 +76,16 @@ build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c rule cxx_source_bootstrap -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $ - -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $ -- -DNDEBUG -fPIC -o $out -c $in -+ -DNDEBUG -o $out -c $in CXXFLAGS +- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ +- -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in ++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ ++ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ ++ -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -99,7 +99,7 @@ +@@ -100,7 +100,7 @@ 3rd/bee.lua/bootstrap/progdir.cpp rule link_luamake command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $ diff --git a/dev-util/lua-language-server/lua-language-server-3.6.7.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild similarity index 100% rename from dev-util/lua-language-server/lua-language-server-3.6.7.ebuild rename to dev-util/lua-language-server/lua-language-server-3.6.8.ebuild