commit: cfa8c2c6246f781b517883b92471b045e9228732
Author: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Tue Mar 28 13:48:37 2023 +0000
Commit: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
CommitDate: Tue Mar 28 13:48:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cfa8c2c6
dev-util/lua-language-server: add 3.6.18, drop 3.6.17
Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>
dev-util/lua-language-server/Manifest | 2 +-
.../lua-language-server/files/build.ninja.patch | 22 +++++++--------
.../lua-language-server/files/linux.ninja.patch | 31 +++++++---------------
...17.ebuild => lua-language-server-3.6.18.ebuild} | 0
4 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/dev-util/lua-language-server/Manifest
b/dev-util/lua-language-server/Manifest
index df201ba8c..5176e1a31 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.17.zip 30696826 BLAKE2B
a6d65b45efd7e10afef4a48986a3e7f622885146830df26647653065efd35c8bada7421ad74ea990cfb3842756dd42fe304c6bfbb3346d00621dd1c4d1e653f8
SHA512
44cbdb25fbd90ca9931669a3cb90216bb6f33ac1e2dc0dea4c28a4340f9c2feb92c005b2212fadc33066481944bb27c03c541cd0c6d0cd7706eeeca34339d567
+DIST lua-language-server-3.6.18.zip 30708893 BLAKE2B
69bc01187fd85582766bf0d8f217bea163234d05698490b860d0ff446fcc0515f3b842600ff2ea980ff8c30acfb7b394df9a98b81a5b537df445cc18a70b744e
SHA512
b2bc488734df7eb0ad00993d352917d9d328b73603319fa8f1b0da8e93586cfdb85e715d6c3bd2ad6a9189551cc1e86a2fe35d3df4951f5feb80745c498424d2
diff --git a/dev-util/lua-language-server/files/build.ninja.patch
b/dev-util/lua-language-server/files/build.ninja.patch
index ff953cae3..3e03c7d5d 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,26 +12,26 @@
+@@ -12,25 +12,25 @@
3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
make/code_format.lua
rule c_source_bee
@@ -16,16 +16,14 @@
3rd/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 $
-- -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd/3rd -DNDEBUG -fPIC $
-- -o $out -c $in
+- -Werror -fvisibility=hidden -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/3rd -DNDEBUG -fPIC $
-+ -o $out -c $in CXXFLAGS
++ -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 $
- 3rd/bee.lua/bee/nonstd/3rd/fmt/format.cc
+ 3rd/bee.lua/bee/nonstd/3rd/format.cc
rule cxx_source_bee_1
- 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
@@ -34,7 +32,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -57,9 +57,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
@@ -47,7 +45,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -80,26 +80,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
@@ -81,7 +79,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -109,7 +109,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 $
@@ -90,7 +88,7 @@
description = Link Exe $out
build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -148,10 +148,10 @@
+@@ -147,10 +147,10 @@
3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
$bin/bootstrap copy_script
rule cxx_code_format
@@ -103,7 +101,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -246,9 +246,9 @@
+@@ -247,9 +247,9 @@
build $obj/code_format/Utf8.obj: cxx_code_format $
3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
rule c_lpeglabel
@@ -115,7 +113,7 @@
description = Compile C $out
deps = gcc
depfile = $out.d
-@@ -258,9 +258,9 @@
+@@ -259,9 +259,9 @@
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
diff --git a/dev-util/lua-language-server/files/linux.ninja.patch
b/dev-util/lua-language-server/files/linux.ninja.patch
index 7068459ab..baf0d5350 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,29 +2,29 @@
builddir = build/linux
bin = $builddir/bin
obj = $builddir/obj
@@ -20,15 +20,16 @@
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 $
-- -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
+- -Werror -fvisibility=hidden -Ibee.lua/bee/nonstd/3rd -DNDEBUG -fPIC -o $
+- $out -c $in
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
++ -fvisibility=hidden -Ibee.lua/bee/nonstd/3rd -DNDEBUG -fPIC -o $
++ $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -23,8 +23,8 @@
- bee.lua/bee/nonstd/3rd/format.cc
- build $obj/source_bee/os.obj: cxx_source_bee bee.lua/bee/nonstd/3rd/os.cc
+ build $obj/source_bee/format.obj: cxx_source_bee $
+ bee.lua/bee/nonstd/3rd/fmt/format.cc
rule cxx_source_bee_1
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -Werror -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
@@ -37,7 +38,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -47,9 +47,9 @@
+@@ -49,9 +49,9 @@
build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
bee.lua/bee/utility/path_helper.cpp
rule cxx_source_bee_2
@@ -50,7 +51,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -70,24 +70,24 @@
+@@ -72,15 +72,15 @@
build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
@@ -70,19 +71,7 @@
description = Compile C $out
deps = gcc
depfile = $out.d
- build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
- build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
- rule cxx_source_bootstrap
-- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -Werror -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.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 -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
-+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
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.17.ebuild
b/dev-util/lua-language-server/lua-language-server-3.6.18.ebuild
similarity index 100%
rename from dev-util/lua-language-server/lua-language-server-3.6.17.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.18.ebuild
