summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch40
-rw-r--r--dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild141
-rw-r--r--dev-util/lua-language-server/Manifest3
-rw-r--r--dev-util/lua-language-server/files/3.15.0-build.ninja.patch102
-rw-r--r--dev-util/lua-language-server/files/3.16.4-build.ninja.patch (renamed from dev-util/lua-language-server/files/3.16.0-build.ninja.patch)44
-rw-r--r--dev-util/lua-language-server/files/3.16.4-linux.ninja.patch63
-rw-r--r--dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch10
-rw-r--r--dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch30
-rw-r--r--dev-util/lua-language-server/lua-language-server-3.16.0.ebuild86
-rw-r--r--dev-util/lua-language-server/lua-language-server-3.16.1.ebuild6
-rw-r--r--dev-util/lua-language-server/lua-language-server-3.16.4.ebuild (renamed from dev-util/lua-language-server/lua-language-server-3.15.0.ebuild)25
11 files changed, 286 insertions, 264 deletions
diff --git a/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch
new file mode 100644
index 000000000000..e79109f49a99
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch
@@ -0,0 +1,40 @@
+From db8009842bd13233ff1324c393469a6ce6af1528 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 9 Jan 2026 22:29:06 +0100
+Subject: [PATCH] Avoid file collision with other applications by too general
+ icon names
+
+At least with thunar-vcs-plugin a known collision exists.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ plugins/subversion/icons/CMakeLists.txt | 2 +-
+ plugins/subversion/kdevsubversion.json | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/subversion/icons/CMakeLists.txt b/plugins/subversion/icons/CMakeLists.txt
+index 92d6b6bdff..ac57bd0633 100644
+--- a/plugins/subversion/icons/CMakeLists.txt
++++ b/plugins/subversion/icons/CMakeLists.txt
+@@ -1,4 +1,4 @@
+
+-ecm_install_icons(ICONS 16-apps-subversion.png 32-apps-subversion.png 64-apps-subversion.png sc-apps-subversion.svg
++ecm_install_icons(ICONS 16-apps-kdevsubversion.png 32-apps-kdevsubversion.png 64-apps-kdevsubversion.png sc-apps-kdevsubversion.svg
+ DESTINATION ${KDE_INSTALL_ICONDIR}
+ THEME hicolor)
+diff --git a/plugins/subversion/kdevsubversion.json b/plugins/subversion/kdevsubversion.json
+index 9a8650b93f..3c5d9df512 100644
+--- a/plugins/subversion/kdevsubversion.json
++++ b/plugins/subversion/kdevsubversion.json
+@@ -71,7 +71,7 @@
+ "Description[uk]": "Цей додаток інтегрує Subversion із KDevelop.",
+ "Description[zh_CN]": "此插件将 Subversion 整合到 KDevelop。",
+ "Description[zh_TW]": "此外掛程式將 Subversion 整合進 KDevelop 內",
+- "Icon": "subversion",
++ "Icon": "kdevsubversion",
+ "License": "GPL",
+ "Name": "Subversion Support",
+ "Name[ar]": "دعم Subversion",
+--
+2.52.0
+
diff --git a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild
new file mode 100644
index 000000000000..13ccbb944576
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_QA_COMPAT_SKIP=1 # bug 964762
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=6.19.0
+LLVM_COMPAT=( 15 16 17 18 19 20 21 )
+QTMIN=6.9.1
+inherit ecm gear.kde.org llvm-r2 optfeature xdg
+
+DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gdbui plasma +qmake +share subversion"
+
+# UPSTREAM: not ported yet, check plugins/CMakeLists.txt
+# IUSE="hex"
+# hex? ( app-editors/okteta:6 )
+COMMON_DEPEND="
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ >=dev-qt/qttools-${QTMIN}:6[assistant]
+ >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+ >=dev-util/astyle-3.1:=
+ kde-apps/libkomparediff2:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktexttemplate-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/sonnet-${KFMIN}:6
+ >=kde-frameworks/threadweaver-${KFMIN}:6
+ $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
+ gdbui? ( kde-plasma/libksysguard:6= )
+ plasma? (
+ >=kde-frameworks/krunner-${KFMIN}:6
+ kde-plasma/libplasma:6
+ )
+ qmake? ( >=dev-util/kdevelop-pg-qt-2.4.0:0 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+ subversion? (
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ dev-vcs/subversion
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ app-alternatives/ninja
+ >=dev-debug/gdb-7.0[python]
+ >=dev-qt/qttools-${QTMIN}:6[qdbus]
+ kde-apps/kapptemplate:*
+ kde-apps/kio-extras:6
+"
+
+CMAKE_SKIP_TESTS=(
+ # D-Bus required
+ test_{{project,session}controller,midbus,definesandincludes,kdevgit}
+ test_{compilerprovider,cmakemanager,ctestfindsuites,cmakefileapi}
+ test_{custombuildsystemplugin,qmakeproject,projectload,craftruntime}
+ bench_codecompletion # segfaults
+ test_gdb # FIXME: fails to launch xterm (if found)
+ test_{path,generationtest} # FIXME: whatever that does, does not work
+)
+
+PATCHES=( "${FILESDIR}/${P}-file-collision.patch" ) # bug #963324 pt.1
+
+src_prepare() {
+ rm -r plugins/qmljs || die # bug 960669, unused upstream
+ ecm_src_prepare
+
+ # bug #963324 pt.2
+ pushd plugins/subversion/icons > /dev/null || die
+ local icon
+ for icon in 16 32 64; do
+ mv ${icon}-apps-{,kdev}subversion.png || die
+ done
+ mv sc-apps-{,kdev}subversion.svg || die
+ popd > /dev/null || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_ROOT="$(get_llvm_prefix)"
+ $(cmake_use_find_package gdbui KSysGuard)
+ -DBUILD_executeplasmoid=$(usex plasma)
+ $(cmake_use_find_package plasma Plasma)
+ $(cmake_use_find_package qmake KDevelopPGQt)
+ $(cmake_use_find_package share KF6Purpose)
+ $(cmake_use_find_package subversion SubversionLibrary)
+ )
+# $(cmake_use_find_package hex OktetaKastenControllers)
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "konsole view" "kde-apps/konsole:6"
+ optfeature "static C++ Qt code analysis" dev-util/clazy
+ optfeature "static C/C++ code analysis" dev-util/cppcheck
+ optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
+ optfeature "meson project manager plugin" dev-build/meson
+ optfeature "formatting configurations via customscript plugin" dev-util/indent
+ optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
+ fi
+ xdg_pkg_postinst
+}
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 0fb78ec96734..55ec17b41336 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,3 +1,2 @@
-DIST lua-language-server-3.15.0.zip 31509845 BLAKE2B 1ee07166d37e30f9832aba43b45bfc40eb5bfe26e12a3e29be7b307191f72b786ce82e7b245c640c8f1ff7c2debcf8bcd32eecb8613bfef9337f947747300022 SHA512 b7b270b4439dc7154b4cd47d0ecf95d4d9251225abc527bb3f6a99157ff0784902088f3436dc455b083b7c090d97267221ed407720c85b2ac163c3666dabe72c
-DIST lua-language-server-3.16.0.zip 31962898 BLAKE2B ab6a8dfe59f4856c1c0a1d56f953296515e4ca7242cce89c7a7c9898bdfaf5af9b5a214f054e6c3f85c653f6d7ca02bf0356ea5a9893b161fc25903bfe610afd SHA512 fa9c9020c8453c5ddd9a46388dd55ae5cd4e7787b0c1aa58c493b6135f7f2f1bc152976e0b260d44da12f7b95838cfb84026ad422a55319ef84fba258dcc414b
DIST lua-language-server-3.16.1.zip 31995002 BLAKE2B 2c51f7b7cbefc96230d61ac23925521d284ef9875346cad4f5bc3a2ad499393925687eda8057c13ed4279fff03f2ac1d82d3f261d4287d45f40a9791542506a0 SHA512 0fd267ceb35284a7d300af2c1c464ffd6cb2e1fe3945ea936fe5e2316af52838ada4eb9b018a6bb396e95f9eac27e00309d7ed51a7f4bc34529077c3438234cf
+DIST lua-language-server-3.16.4.zip 32006835 BLAKE2B 84f4288b59b724a1332a10da03fd677d41a6062be9a0cb2f2f1f63cb4debca7332ec4d05a2b4b7b8969f18c9737c7c1b5b8d22e00688ec17cce8c9e414ec3533 SHA512 0787e5e2e5149e8a9df8e438b7e63cd55b6354f7fd6cc1cbd13b53df2efd4d185b64bb0fc25baf6800c7075e9f3e7c4826e619ab0786120e40e62679a531c332
diff --git a/dev-util/lua-language-server/files/3.15.0-build.ninja.patch b/dev-util/lua-language-server/files/3.15.0-build.ninja.patch
deleted file mode 100644
index bdf5fbf71aa4..000000000000
--- a/dev-util/lua-language-server/files/3.15.0-build.ninja.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/build/build.ninja
-+++ b/build/build.ninja
-@@ -11,7 +11,7 @@ rule configure
- generator = 1
- rule c_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-- -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -19,14 +19,14 @@ 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 -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 3rd/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 -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -64,7 +64,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 $
- rule cxx_source_bee_2
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $
-- -DNDEBUG -fPIC -o $out -c $in
-+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -94,7 +94,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 $
- 3rd/bee.lua/binding/luaref.cpp
- rule c_source_lua
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
-+ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -103,7 +103,7 @@ build $obj/source_lua/onelua.obj: c_source_lua 3rd/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 $
- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.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
-@@ -111,7 +111,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
- 3rd/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
- rule copy
- command = cp -fv $in$input $out 1>/dev/null
-@@ -126,8 +126,8 @@ rule cxx_code_format
- -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
- -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
- -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $
-- -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
-- $out -c $in
-+ -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
-+ $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -232,7 +232,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
- rule c_lpeglabel
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
-- -o $out -c $in
-+ -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -244,7 +244,7 @@ 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 $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
-- -DNDEBUG -o $out -c $in
-+ -DNDEBUG -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -252,7 +252,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
- make/modules.cpp
- rule link_lua_language_server
- command = $cc $in -o $out -rdynamic -lm -ldl -lstdc++fs -pthread $
-- -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+ -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
- description = Link Exe $out
- rule run_bee_test
- command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/3.16.0-build.ninja.patch b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
index be6bc49d3cfc..54060cc541db 100644
--- a/dev-util/lua-language-server/files/3.16.0-build.ninja.patch
+++ b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
@@ -3,17 +3,17 @@
@@ -12,14 +12,14 @@ rule configure
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -I3rd/bee.lua/3rd/lua54 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
+ -I3rd/bee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
- $out -c $in
+ $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
- build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua54/onelua.c
+ build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua55/onelua.c
rule cxx_source_bee
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+- -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
@@ -29,40 +29,40 @@
@@ -36,7 +36,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 $
rule cxx_source_bee_2
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DNDEBUG $
+ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DNDEBUG $
- -fPIC -o $out -c $in
+ -fPIC -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -90,7 +90,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
+@@ -84,7 +84,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
rule c_source_bee
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DBEE_STATIC $
+ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DBEE_STATIC $
- -DNDEBUG -fPIC -o $out -c $in
+ -DNDEBUG -fPIC -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
-@@ -134,7 +134,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
+@@ -128,7 +128,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
rule cxx_source_bootstrap
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 $
+ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 $
- -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
+ -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -144,7 +144,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+@@ -138,7 +138,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
3rd/bee.lua/bootstrap/main.cpp
rule link_bootstrap
- command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -lunwind -lbfd $
-- -pthread -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+ -pthread -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+ command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+- -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++ -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
description = Link Exe $out
rule copy
command = cp -fv $in$input $out 1>/dev/null
-@@ -159,8 +159,8 @@ rule cxx_code_format
+@@ -153,8 +153,8 @@ rule cxx_code_format
-fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
-I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
-I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua54 $
@@ -73,30 +73,30 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -265,7 +265,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
+@@ -259,7 +259,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
rule c_lpeglabel
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DMAXRECLEVEL=1000 -DNDEBUG $
+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DMAXRECLEVEL=1000 -DNDEBUG $
- -o $out -c $in
+ -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
-@@ -277,7 +277,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
+@@ -271,7 +271,7 @@ 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 $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DCODE_FORMAT $
+ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DCODE_FORMAT $
- -DNDEBUG -o $out -c $in
+ -DNDEBUG -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -285,7 +285,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
+@@ -279,7 +279,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
make/modules.cpp
rule link_lua_language_server
- command = $cc $in -o $out -rdynamic -lstdc++fs -lunwind -lbfd -pthread $
-- -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+ -lm -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
+ command = $cc $in -o $out -rdynamic -lstdc++fs -pthread -lm -ldl $
+- -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++ -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
description = Link Exe $out
rule run_bee_test
command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
new file mode 100644
index 000000000000..4b315028842e
--- /dev/null
+++ b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
@@ -0,0 +1,63 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
+@@ -2,20 +2,20 @@ ninja_required_version = 1.7
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
+-ar = ar
++cc = REPLACE_ME
++ar = REPLACE_AR
+ luamake = luamake
+ rule c_source_lua
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+ -Ibee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out $
+ -c $in
+- description = Compile C $out
++ description = Compile C $out CFLAGS
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua55/onelua.c
+ rule cxx_source_bee
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+- -fvisibility=hidden -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -Ibee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -23,7 +23,7 @@ build $obj/source_bee/lua-seri.obj: cxx_source_bee $
+ bee.lua/3rd/lua-seri/lua-seri.cpp
+ rule cxx_source_bee_1
+ 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
+@@ -31,7 +31,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_2
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $
+- $out -c $in
++ $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -119,7 +119,7 @@ rule cxx_source_bootstrap
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DLUA_USE_LINUX $
+ -DNDEBUG -fPIC -o $out -c $in
+- description = Compile C++ $out
++ description = Compile C++ $out CXXFLAGS
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_bootstrap/bootstrap_init.obj: cxx_source_bootstrap $
+@@ -128,7 +128,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+ bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+ command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+- -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++ -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+ description = Link Exe $out
+ rule copy
+ command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch b/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch
deleted file mode 100644
index 2f38d8970894..000000000000
--- a/dev-util/lua-language-server/files/lua-language-server-3.10.5-uint32_t-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/3rd/EmmyLuaCodeStyle/Util/include/Util/SymSpell/SymSpell.h
-+++ b/3rd/EmmyLuaCodeStyle/Util/include/Util/SymSpell/SymSpell.h
-@@ -29,6 +29,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <stdint.h>
-
- class SymSpell {
- public:
diff --git a/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch b/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch
deleted file mode 100644
index 60a0eb51e765..000000000000
--- a/dev-util/lua-language-server/files/lua-language-server-3.16.0-ucontext_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/3rd/bee.lua/bee/crash/unwind_linux.cpp
-+++ b/3rd/bee.lua/bee/crash/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
- void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
- unw_cursor_t cursor;
--#if defined(__aarch64__)
- unw_context_t *unw_ctx = (unw_context_t *)ctx;
- unw_init_local(&cursor, unw_ctx);
--#else
-- unw_init_local(&cursor, ctx);
--#endif
- while (unw_step(&cursor) > 0) {
- unw_word_t pc;
- unw_get_reg(&cursor, UNW_REG_IP, &pc);
---- a/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-+++ b/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
- void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
- unw_cursor_t cursor;
--#if defined(__aarch64__)
- unw_context_t *unw_ctx = (unw_context_t *)ctx;
- unw_init_local(&cursor, unw_ctx);
--#else
-- unw_init_local(&cursor, ctx);
--#endif
- while (unw_step(&cursor) > 0) {
- unw_word_t pc;
- unw_get_reg(&cursor, UNW_REG_IP, &pc);
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.0.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.0.ebuild
deleted file mode 100644
index 7df5b3e107e0..000000000000
--- a/dev-util/lua-language-server/lua-language-server-3.16.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-inherit ninja-utils toolchain-funcs lua-single prefix
-
-DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/LuaLS/lua-language-server"
-SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRE_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="${LUA_DEPS}"
-RDEPEND="${DEPEND}"
-BDEPEND="
- app-alternatives/ninja
- app-arch/unzip
- sys-libs/libunwind
-"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- # Remove hardcoded gcc references
- sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
- make.lua || die
- sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
- 3rd/lpeglabel/makefile || die
- # Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
- eapply "${FILESDIR}/${PV}-linux.ninja.patch"
- eapply "${FILESDIR}/${PN}-${PV}-ucontext_t.patch"
- eapply_user
- sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
- -e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
- -e "s/CFLAGS/${CFLAGS}/" \
- -e "s/CXXFLAGS/${CXXFLAGS}/" \
- -e "s/LDFLAGS/${LDFLAGS}/" \
- 3rd/luamake/compile/ninja/linux.ninja || die
-
- prefixify_ro "${FILESDIR}/wrapper.sh"
-}
-
-src_compile() {
- eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
- use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
- ./3rd/luamake/luamake init || die
-
- # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
- sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
- -e "s/^ar =.*./ar = REPLACE_AR/" \
- build/build.ninja || die
-
- eapply "${FILESDIR}/${PV}-build.ninja.patch"
- sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
- -e "s/REPLACE_AR/$(tc-getAR)/" \
- -e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
- -e "s/CFLAGS/${CFLAGS}/" \
- -e "s/CXXFLAGS/${CXXFLAGS}/" \
- -e "s/LDFLAGS/${LDFLAGS}/" \
- build/build.ninja || die
-
- use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
- rm -rf meta/198256b1
-}
-
-src_install() {
- newbin "${T}/wrapper.sh" ${PN}
-
- into /opt/${PN}
- dobin bin/${PN}
-
- insinto /opt/${PN}/bin
- doins bin/main.lua
-
- insinto /opt/${PN}
- doins -r debugger.lua main.lua locale meta script
-
- einstalldocs
-}
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
index 6f95af8a0366..b8c86a131d66 100644
--- a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
@@ -47,8 +47,9 @@ src_prepare() {
-e "s/CXXFLAGS/${CXXFLAGS}/" \
-e "s/LDFLAGS/${LDFLAGS}/" \
3rd/luamake/compile/ninja/linux.ninja || die
- [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] &&
+ if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+ fi
prefixify_ro "${FILESDIR}/wrapper.sh"
}
@@ -71,8 +72,9 @@ src_compile() {
-e "s/CXXFLAGS/${CXXFLAGS}/" \
-e "s/LDFLAGS/${LDFLAGS}/" \
build/build.ninja || die
- [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] &&
+ if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
sed -i "s/-lstdc++fs//" build/build.ninja || die
+ fi
use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
rm -rf meta/198256b1
diff --git a/dev-util/lua-language-server/lua-language-server-3.15.0.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
index 9ee789214186..2350e903ec8b 100644
--- a/dev-util/lua-language-server/lua-language-server-3.15.0.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,21 +15,21 @@ S="${WORKDIR}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="llvm-libunwind test"
REQUIRE_USE="${LUA_REQUIRED_USE}"
-DEPEND="${LUA_DEPS}"
+DEPEND="
+ ${LUA_DEPS}
+ sys-libs/binutils-libs
+"
RDEPEND="${DEPEND}"
BDEPEND="
app-alternatives/ninja
app-arch/unzip
+ !llvm-libunwind? ( sys-libs/libunwind )
+ llvm-libunwind? ( llvm-runtimes/libunwind )
"
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/linux.ninja.patch"
- "${FILESDIR}/${PV}-build.ninja.patch"
- "${FILESDIR}/${PN}-3.10.5-uint32_t-fix.patch"
-)
src_prepare() {
# Remove hardcoded gcc references
@@ -38,7 +38,7 @@ src_prepare() {
sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
3rd/lpeglabel/makefile || die
# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
- eapply "${FILESDIR}/linux.ninja.patch"
+ eapply "${FILESDIR}/3.16.4-linux.ninja.patch"
eapply_user
sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
@@ -46,6 +46,9 @@ src_prepare() {
-e "s/CXXFLAGS/${CXXFLAGS}/" \
-e "s/LDFLAGS/${LDFLAGS}/" \
3rd/luamake/compile/ninja/linux.ninja || die
+ if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+ sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+ fi
prefixify_ro "${FILESDIR}/wrapper.sh"
}
@@ -61,7 +64,6 @@ src_compile() {
build/build.ninja || die
eapply "${FILESDIR}/${PV}-build.ninja.patch"
- eapply "${FILESDIR}/${PN}-3.10.5-uint32_t-fix.patch"
sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
-e "s/REPLACE_AR/$(tc-getAR)/" \
-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
@@ -69,6 +71,9 @@ src_compile() {
-e "s/CXXFLAGS/${CXXFLAGS}/" \
-e "s/LDFLAGS/${LDFLAGS}/" \
build/build.ninja || die
+ if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+ sed -i "s/-lstdc++fs//" build/build.ninja || die
+ fi
use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
rm -rf meta/198256b1
generated by cgit v1.3 (git 2.53.0) at 2026-10-14 01:40:58 +0000