CVS commit: pkgsrc/lang/py-cmake-language-server

Modified files:

Index: pkgsrc/lang/py-cmake-language-server/Makefile
diff -u pkgsrc/lang/py-cmake-language-server/Makefile:1.15 pkgsrc/lang/py-cmake-language-server/Makefile:1.16
--- pkgsrc/lang/py-cmake-language-server/Makefile:1.15	Wed Feb 12 06:15:59 2025
+++ pkgsrc/lang/py-cmake-language-server/Makefile	Sat Aug  8 15:52:29 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2025/02/12 06:15:59 adam Exp $
+# $NetBSD: Makefile,v 1.16 2026/08/08 15:52:29 wiz Exp $
 
 DISTNAME=	cmake_language_server-0.1.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cmake-language-server/}
 
@@ -20,9 +21,13 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-datad
 # only for tests
 USE_LANGUAGES=	c c++
 
+PY_RENAME_BINARIES=	cmake-language-server
+
+# as of 0.1.11nb1
+# 2 failed, 7 passed, 67 warnings, 7 errors
+
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && \
-	${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX} || ${TRUE}
+	${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/cmake_language_server/server.py.orig
 
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/py-cmake-language-server/distinfo
diff -u pkgsrc/lang/py-cmake-language-server/distinfo:1.11 pkgsrc/lang/py-cmake-language-server/distinfo:1.12
--- pkgsrc/lang/py-cmake-language-server/distinfo:1.11	Wed Feb 12 06:15:59 2025
+++ pkgsrc/lang/py-cmake-language-server/distinfo	Sat Aug  8 15:52:29 2026
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.11 2025/02/12 06:15:59 adam Exp $
+$NetBSD: distinfo,v 1.12 2026/08/08 15:52:29 wiz Exp $
 
+BLAKE2s (107.patch) = 4e77cb090e4b3815c038e7e738fff1db0abeb81436fd4ae28b5125fdb8f688ed
+SHA512 (107.patch) = 34a1068f22a569f737c25ee3aecbc0d2caf1a482ca720b8b3c5c4cbacc034f0d830b9ca6248a6fb44902d5ca1b236aa8fd9f737e1910ffc7ef992b26da9e2d4f
+Size (107.patch) = 204040 bytes
 BLAKE2s (cmake_language_server-0.1.11.tar.gz) = e2ce92be1b201156092669fb23f0defb1e80bff9c67eccca1bdd67a7ea2573b4
 SHA512 (cmake_language_server-0.1.11.tar.gz) = 25ecacf06330d2dd081773ae6b3e4a0c2b61f0ed81658555b1905330c2249bd894ca91c884b2322a16b82572d2f124410a8326d0d2ddcc9e1ce3e2140caeb970
 Size (cmake_language_server-0.1.11.tar.gz) = 11849 bytes
+SHA1 (patch-cmake__language__server_server.py) = f43b0db8a65838e9a2c04486426004d35042e494
+SHA1 (patch-tests_conftest.py) = ace870781553adb490035b655b8183dbf94c99ae
+SHA1 (patch-tests_test__server.py) = 90334599f85d4bf70b50c36089601b49e7f669f0

Added files:

Index: pkgsrc/lang/py-cmake-language-server/patches/patch-cmake__language__server_server.py
diff -u /dev/null pkgsrc/lang/py-cmake-language-server/patches/patch-cmake__language__server_server.py:1.1
--- /dev/null	Sat Aug  8 15:52:30 2026
+++ pkgsrc/lang/py-cmake-language-server/patches/patch-cmake__language__server_server.py	Sat Aug  8 15:52:29 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-cmake__language__server_server.py,v 1.1 2026/08/08 15:52:29 wiz Exp $
+
+Upgraded dependencies due to mismatch with system modules
+https://github.com/regen100/cmake-language-server/pull/107
+
+--- cmake_language_server/server.py.orig	2025-02-11 02:51:07.301587000 +0000
++++ cmake_language_server/server.py
+@@ -31,12 +31,11 @@ from lsprotocol.types import (
+     TextDocumentPositionParams,
+     TextEdit,
+ )
+-from pygls.server import LanguageServer
++from pygls.lsp.server import LanguageServer
+ 
+ from .api import API
+ 
+ logger = logging.getLogger(__name__)
+-
+ 
+ class CMakeLanguageServer(LanguageServer):
+     _api: Optional[API]
Index: pkgsrc/lang/py-cmake-language-server/patches/patch-tests_conftest.py
diff -u /dev/null pkgsrc/lang/py-cmake-language-server/patches/patch-tests_conftest.py:1.1
--- /dev/null	Sat Aug  8 15:52:30 2026
+++ pkgsrc/lang/py-cmake-language-server/patches/patch-tests_conftest.py	Sat Aug  8 15:52:29 2026
@@ -0,0 +1,37 @@
+$NetBSD: patch-tests_conftest.py,v 1.1 2026/08/08 15:52:29 wiz Exp $
+
+Upgraded dependencies due to mismatch with system modules
+https://github.com/regen100/cmake-language-server/pull/107
+
+--- tests/conftest.py.orig	2025-02-11 02:51:07.305587000 +0000
++++ tests/conftest.py
+@@ -1,4 +1,4 @@
+-import logging
++import logging 
+ import os
+ from pathlib import Path
+ from subprocess import PIPE, run
+@@ -7,7 +7,7 @@ from lsprotocol.types import EXIT, SHUTDOWN
+ 
+ import pytest
+ from lsprotocol.types import EXIT, SHUTDOWN
+-from pygls.server import LanguageServer
++from pygls.lsp.server import LanguageServer
+ 
+ from cmake_language_server.server import CMakeLanguageServer
+ 
+@@ -51,10 +51,10 @@ def client_server() -> Iterable[Tuple[LanguageServer, 
+     yield client, server
+ 
+     # fix bug on python 3.7
+-    if hasattr(client.loop, "_signal_handlers"):
+-        client.loop._signal_handlers.clear()
++    # if hasattr(client.loop, "_signal_handlers"):
++        # client.loop._signal_handlers.clear()
+ 
+-    client.lsp.send_request(SHUTDOWN)  # type:ignore[no-untyped-call]
+-    client.lsp.notify(EXIT)
++    client.protocol.send_request(SHUTDOWN)  # type:ignore[no-untyped-call]
++    client.protocol.notify(EXIT)
+     client_thread.join()
+     server_thread.join()
Index: pkgsrc/lang/py-cmake-language-server/patches/patch-tests_test__server.py
diff -u /dev/null pkgsrc/lang/py-cmake-language-server/patches/patch-tests_test__server.py:1.1
--- /dev/null	Sat Aug  8 15:52:30 2026
+++ pkgsrc/lang/py-cmake-language-server/patches/patch-tests_test__server.py	Sat Aug  8 15:52:29 2026
@@ -0,0 +1,70 @@
+$NetBSD: patch-tests_test__server.py,v 1.1 2026/08/08 15:52:29 wiz Exp $
+
+Upgraded dependencies due to mismatch with system modules
+https://github.com/regen100/cmake-language-server/pull/107
+
+--- tests/test_server.py.orig	2025-02-11 02:51:07.305587000 +0000
++++ tests/test_server.py
+@@ -27,7 +27,7 @@ from lsprotocol.types import (
+     TextDocumentIdentifier,
+     TextDocumentItem,
+ )
+-from pygls.server import LanguageServer
++from pygls.lsp.server import LanguageServer
+ 
+ from cmake_language_server.server import CMakeLanguageServer
+ 
+@@ -38,7 +38,7 @@ def _init(client: LanguageServer, root: Path) -> None:
+     retry = 3
+     while retry > 0:
+         try:
+-            client.lsp.send_request(  # type:ignore[no-untyped-call]
++            client.protocol.send_request(  # type:ignore[no-untyped-call]
+                 INITIALIZE,
+                 InitializeParams(
+                     process_id=1234,
+@@ -56,7 +56,7 @@ def _open(client: LanguageServer, path: Path, text: Op
+     if text is None:
+         text = path.read_text()
+ 
+-    client.lsp.notify(
++    client.protocol.notify(
+         TEXT_DOCUMENT_DID_OPEN,
+         DidOpenTextDocumentParams(
+             text_document=TextDocumentItem(
+@@ -81,7 +81,7 @@ def _test_completion(
+         position=Position(line=0, character=len(content)),
+         context=context,
+     )
+-    ret = client.lsp.send_request(  # type:ignore[no-untyped-call]
++    ret = client.protocol.send_request(  # type:ignore[no-untyped-call]
+         TEXT_DOCUMENT_COMPLETION, params
+     ).result(timeout=CALL_TIMEOUT)
+     assert isinstance(ret, CompletionList)
+@@ -107,7 +107,7 @@ def test_workspace_did_change_configuration(
+ 
+     old_api = server._api
+ 
+-    client.lsp.notify(
++    client.protocol.notify(
+         WORKSPACE_DID_CHANGE_CONFIGURATION,
+         DidChangeConfigurationParams(
+             settings={"initialization_options": {"buildDirectory": "c_build"}}
+@@ -169,7 +169,7 @@ def test_formatting(
+     _init(client, datadir)
+     path = datadir / "CMakeLists.txt"
+     _open(client, path, "a ( b c ) ")
+-    response = client.lsp.send_request(  # type:ignore[no-untyped-call]
++    response = client.protocol.send_request(  # type:ignore[no-untyped-call]
+         TEXT_DOCUMENT_FORMATTING,
+         DocumentFormattingParams(
+             text_document=TextDocumentIdentifier(uri=path.as_uri()),
+@@ -186,7 +186,7 @@ def test_hover(
+     _init(client, datadir)
+     path = datadir / "CMakeLists.txt"
+     _open(client, path, "project()")
+-    response = client.lsp.send_request(  # type:ignore[no-untyped-call]
++    response = client.protocol.send_request(  # type:ignore[no-untyped-call]
+         TEXT_DOCUMENT_HOVER,
+         HoverParams(
+             text_document=TextDocumentIdentifier(uri=path.as_uri()),