CVS commit: pkgsrc/devel/py-langkit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct  9 11:25:49 UTC 2025

Modified Files:
        pkgsrc/devel/py-langkit: Makefile distinfo
Added Files:
        pkgsrc/devel/py-langkit/patches: patch-langkit_compiled__types.py
            patch-langkit_libmanage.py patch-langkit_utils_____init____.py

Log Message:
py-langkit: merge upstream patch to fix build with Python 3.13+


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-langkit/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-langkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-langkit/patches/patch-langkit_compiled__types.py \
    pkgsrc/devel/py-langkit/patches/patch-langkit_libmanage.py \
    pkgsrc/devel/py-langkit/patches/patch-langkit_utils_____init____.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-langkit/Makefile
diff -u pkgsrc/devel/py-langkit/Makefile:1.2 pkgsrc/devel/py-langkit/Makefile:1.3
--- pkgsrc/devel/py-langkit/Makefile:1.2        Sat Sep 13 09:16:25 2025
+++ pkgsrc/devel/py-langkit/Makefile    Thu Oct  9 11:25:49 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2025/09/13 09:16:25 dkazankov Exp $
+# $NetBSD: Makefile,v 1.3 2025/10/09 11:25:49 wiz Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${PYPKGPREFIX}-${GITHUB_PROJECT}-25.0.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_PROJECT=        langkit
@@ -55,8 +56,5 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-e3-testsui
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/create-project.py ${DESTDIR}${PREFIX}/bin/create-project${PYVERSSUFFIX}.py
 
-# langkit uses deprecated pipes module
-PYTHON_VERSIONS_INCOMPATIBLE+= 313
-
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-langkit/distinfo
diff -u pkgsrc/devel/py-langkit/distinfo:1.1 pkgsrc/devel/py-langkit/distinfo:1.2
--- pkgsrc/devel/py-langkit/distinfo:1.1        Thu Sep  4 11:07:43 2025
+++ pkgsrc/devel/py-langkit/distinfo    Thu Oct  9 11:25:49 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2025/09/04 11:07:43 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/10/09 11:25:49 wiz Exp $
 
 BLAKE2s (langkit-25.0.0.tar.gz) = 95e96b32ab3fe5f08608b39b0e547d0de4e25715b4785ae6aa642d477117a1f5
 SHA512 (langkit-25.0.0.tar.gz) = 27ffecb9b6c5568ebdba4864d9c5ef7e511718083fe087e3af60cfe8cc994b6ea7353cc745bc33395d33e169aaaf6916d991fa4941774932904df3e9b455f1dc
 Size (langkit-25.0.0.tar.gz) = 1560623 bytes
+SHA1 (patch-langkit_compiled__types.py) = 2184ebb966995d896124a430283c86fc780c4fc3
+SHA1 (patch-langkit_libmanage.py) = 34662e6927f07c45fb30299432976d7311b0c8b1
+SHA1 (patch-langkit_utils_____init____.py) = 703490d196007a91ab34ab42695eb458521f549b

Added files:

Index: pkgsrc/devel/py-langkit/patches/patch-langkit_compiled__types.py
diff -u /dev/null pkgsrc/devel/py-langkit/patches/patch-langkit_compiled__types.py:1.1
--- /dev/null   Thu Oct  9 11:25:49 2025
+++ pkgsrc/devel/py-langkit/patches/patch-langkit_compiled__types.py    Thu Oct  9 11:25:49 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-langkit_compiled__types.py,v 1.1 2025/10/09 11:25:49 wiz Exp $
+
+Transition uses of the Python pipes module to shlex
+"pipes" was removed from Python 3.13.
+https://github.com/AdaCore/langkit/commit/dbacb9b5545315e7045ef082dba99d2c96ed1356
+
+--- langkit/compiled_types.py.orig     2024-09-17 09:18:15.000000000 +0000
++++ langkit/compiled_types.py
+@@ -6,7 +6,7 @@ from contextlib import AbstractContextMa
+ from dataclasses import dataclass
+ import difflib
+ from itertools import count, takewhile
+-import pipes
++import shlex
+ from typing import (
+     Any, Callable, ClassVar, Dict, Iterator, List, Optional as Opt, Sequence,
+     Set, TYPE_CHECKING, Tuple, Union, ValuesView
Index: pkgsrc/devel/py-langkit/patches/patch-langkit_libmanage.py
diff -u /dev/null pkgsrc/devel/py-langkit/patches/patch-langkit_libmanage.py:1.1
--- /dev/null   Thu Oct  9 11:25:49 2025
+++ pkgsrc/devel/py-langkit/patches/patch-langkit_libmanage.py  Thu Oct  9 11:25:49 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-langkit_libmanage.py,v 1.1 2025/10/09 11:25:49 wiz Exp $
+
+Transition uses of the Python pipes module to shlex
+"pipes" was removed from Python 3.13.
+https://github.com/AdaCore/langkit/commit/dbacb9b5545315e7045ef082dba99d2c96ed1356
+
+--- langkit/libmanage.py.orig  2024-09-17 09:18:15.000000000 +0000
++++ langkit/libmanage.py
+@@ -9,7 +9,7 @@ import json
+ import os
+ from os import path
+ import pdb
+-import pipes
++import shlex
+ import shutil
+ import subprocess
+ import sys
+@@ -1581,9 +1581,7 @@ class ManageScript(abc.ABC):
+         :param argv: Arguments for the command to log.
+         """
+         if self.verbosity.debug:
+-            printcol('Executing: {}'.format(
+-                ' '.join(pipes.quote(arg) for arg in argv)
+-            ), Colors.CYAN)
++            printcol('Executing: {}'.format(shlex.join(argv)), Colors.CYAN)
+ 
+     def log_info(self, msg: str, color: str) -> None:
+         """
Index: pkgsrc/devel/py-langkit/patches/patch-langkit_utils_____init____.py
diff -u /dev/null pkgsrc/devel/py-langkit/patches/patch-langkit_utils_____init____.py:1.1
--- /dev/null   Thu Oct  9 11:25:49 2025
+++ pkgsrc/devel/py-langkit/patches/patch-langkit_utils_____init____.py Thu Oct  9 11:25:49 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-langkit_utils_____init____.py,v 1.1 2025/10/09 11:25:49 wiz Exp $
+
+Transition uses of the Python pipes module to shlex
+"pipes" was removed from Python 3.13.
+https://github.com/AdaCore/langkit/commit/dbacb9b5545315e7045ef082dba99d2c96ed1356
+
+--- langkit/utils/__init__.py.orig     2024-09-17 09:18:15.000000000 +0000
++++ langkit/utils/__init__.py
+@@ -11,7 +11,6 @@ from contextlib import ExitStack, contex
+ from copy import copy
+ from enum import Enum
+ import os
+-import pipes
+ import shlex
+ import shutil
+ from typing import (
+@@ -265,7 +264,7 @@ def format_setenv(name: str, path: str) 
+     environment variable.
+     """
+     return (
+-        f'{name}={pipes.quote(path)}"{os.pathsep}${name}";'
++        f'{name}={shlex.quote(path)}"{os.pathsep}${name}";'
+         f" export {name}"
+     )
+