[gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/files/, dev-util/lua-language-server/

["Florian Schmaus" <flow@gentoo.org>]

commit:     23e8e520d9b8af85911db07a906da5f458bdc570
Author:     Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Mon Jan  2 17:21:19 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 17:21:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23e8e520

dev-util/lua-language-server: Switch to patches

Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>

 dev-util/lua-language-server/files/build.ninja.patch          | 6 +++---
 dev-util/lua-language-server/files/linux.ninja.patch          | 4 ++--
 dev-util/lua-language-server/lua-language-server-3.6.4.ebuild | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 49111813b..d736f3619 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,5 +1,5 @@
---- a/build/build.ninja	2023-01-01 23:53:30.813718024 +0100
-+++ b/build/build.ninja	2023-01-01 23:04:59.011627739 +0100
+--- a/build/build.ninja
++++ b/build/build.ninja
 @@ -2,7 +2,7 @@
  builddir = build
  bin = bin
@@ -109,7 +109,7 @@
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
 +    -I3rd/EmmyLuaCodeStyle/include $
      -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
--    -DNDEBUG -march=native -O2 -pipe -o $out -c $in
+-    -DNDEBUG -Wall -Werror -o $out -c $in
 +    -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc

diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index a9a853ed7..b5dbb5348 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -1,5 +1,5 @@
---- a/3rd/luamake/compile/ninja/linux.ninja	2022-11-29 13:53:05.000000000 +0100
-+++ b/3rd/luamake/compile/ninja/linux.ninja	2023-01-01 22:40:43.690777107 +0100
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
 @@ -2,20 +2,20 @@
  builddir = build/linux
  bin = $builddir/bin

diff --git a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
index f0cf3d9c3..1284b7e95 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
@@ -28,8 +28,6 @@ src_prepare() {
 		make.lua || die
 	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
 		3rd/lpeglabel/makefile || die
-	sed -i "s/flags = \"-Wall -Werror\"/flags =\"${CXXFLAGS}\"/" \
-		make/code_format.lua || die
 	# Patch
 	default
 	# Shipped file doesn't respect CFLAGS/CXXFLAGS