CVS commit: pkgsrc/audio/py-beets

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 29 17:54:58 UTC 2025

Modified Files:
        pkgsrc/audio/py-beets: Makefile distinfo
Added Files:
        pkgsrc/audio/py-beets/patches: patch-beets_ui_____init____.py
            patch-beetsplug_lyrics.py

Log Message:
py-beets: merge Debian patch for Python 3.14 support

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/audio/py-beets/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/py-beets/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/py-beets/patches/patch-beets_ui_____init____.py \
    pkgsrc/audio/py-beets/patches/patch-beetsplug_lyrics.py

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

Modified files:

Index: pkgsrc/audio/py-beets/Makefile
diff -u pkgsrc/audio/py-beets/Makefile:1.47 pkgsrc/audio/py-beets/Makefile:1.48
--- pkgsrc/audio/py-beets/Makefile:1.47 Mon Dec 29 17:49:57 2025
+++ pkgsrc/audio/py-beets/Makefile      Mon Dec 29 17:54:57 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2025/12/29 17:49:57 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/12/29 17:54:57 wiz Exp $
 
 DISTNAME=      beets-2.5.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    audio python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/beets/}
 
@@ -40,9 +41,7 @@ USE_TOOLS+=   git
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
-# does not support Python 3.14 as of 2.5.1
-# https://github.com/beetbox/beets/issues/6230
-PYTHON_VERSIONS_INCOMPATIBLE=  310 314
+PYTHON_VERSIONS_INCOMPATIBLE=  310
 
 # as of 2.5.1
 # 1082 passed, 101 skipped
@@ -60,6 +59,8 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/man/beet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/beet-${PYVERSSUFFIX}.1
        ${INSTALL_DATA} ${WRKSRC}/man/beetsconfig.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/beetsconfig-${PYVERSSUFFIX}.5
        cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet-${PYVERSSUFFIX} || ${TRUE}
+       ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/beets/ui/__init__.py.orig
+       ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/beetsplug/lyrics.py.orig
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/audio/py-beets/distinfo
diff -u pkgsrc/audio/py-beets/distinfo:1.26 pkgsrc/audio/py-beets/distinfo:1.27
--- pkgsrc/audio/py-beets/distinfo:1.26 Sun Oct 19 18:42:55 2025
+++ pkgsrc/audio/py-beets/distinfo      Mon Dec 29 17:54:57 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.26 2025/10/19 18:42:55 wiz Exp $
+$NetBSD: distinfo,v 1.27 2025/12/29 17:54:57 wiz Exp $
 
 BLAKE2s (beets-2.5.1.tar.gz) = 41091492b86070d8b52fa354466ee02923c2ea229809b89d4fa64d15dd432a1b
 SHA512 (beets-2.5.1.tar.gz) = 289f68804e7293e93044b7ab7ed1537e0cbf07bb4e0f081d89875fabdb22af747f377dde30bf9d489086dd53525cbac348ec3b5c9642fdb551eeda63e2b5dcc0
 Size (beets-2.5.1.tar.gz) = 2147257 bytes
+SHA1 (patch-beets_ui_____init____.py) = d424cb78976cd619840e317f68470cdb51c709bf
+SHA1 (patch-beetsplug_lyrics.py) = e113e8ccd31510e8850e7d12a4f2f9849032af1e

Added files:

Index: pkgsrc/audio/py-beets/patches/patch-beets_ui_____init____.py
diff -u /dev/null pkgsrc/audio/py-beets/patches/patch-beets_ui_____init____.py:1.1
--- /dev/null   Mon Dec 29 17:54:58 2025
+++ pkgsrc/audio/py-beets/patches/patch-beets_ui_____init____.py        Mon Dec 29 17:54:58 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-beets_ui_____init____.py,v 1.1 2025/12/29 17:54:58 wiz Exp $
+
+Python 3.14 support from Debian
+https://github.com/beetbox/beets/issues/6230
+
+--- beets/ui/__init__.py.orig  2025-10-14 22:51:25.515184900 +0000
++++ beets/ui/__init__.py
+@@ -712,7 +712,7 @@ def term_width():
+         return fallback
+ 
+     try:
+-        buf = fcntl.ioctl(0, termios.TIOCGWINSZ, " " * 4)
++        buf = fcntl.ioctl(0, termios.TIOCGWINSZ, b'\x00' * 8)
+     except OSError:
+         return fallback
+     try:
Index: pkgsrc/audio/py-beets/patches/patch-beetsplug_lyrics.py
diff -u /dev/null pkgsrc/audio/py-beets/patches/patch-beetsplug_lyrics.py:1.1
--- /dev/null   Mon Dec 29 17:54:58 2025
+++ pkgsrc/audio/py-beets/patches/patch-beetsplug_lyrics.py     Mon Dec 29 17:54:58 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-beetsplug_lyrics.py,v 1.1 2025/12/29 17:54:58 wiz Exp $
+
+Python 3.14 support from Debian
+https://github.com/beetbox/beets/issues/6230
+
+--- beetsplug/lyrics.py.orig   2025-10-14 22:51:25.520185000 +0000
++++ beetsplug/lyrics.py
+@@ -745,7 +745,7 @@ class Translator(RequestHandler):
+     TRANSLATE_URL = "https://api.cognitive.microsofttranslator.com/translate";
+     LINE_PARTS_RE = re.compile(r"^(\[\d\d:\d\d.\d\d\]|) *(.*)$")
+     SEPARATOR = " | "
+-    remove_translations = partial(re.compile(r" / [^\n]+").sub, "")
++    remove_translations = staticmethod(partial(re.compile(r" / [^\n]+").sub, ""))
+ 
+     _log: Logger
+     api_key: str