diff --git a/srcpkgs/beets/patches/3eb68ef830447d91b10a928823edb3c50cf73f48.patch b/srcpkgs/beets/patches/3eb68ef830447d91b10a928823edb3c50cf73f48.patch index af8ad9dfba2ffd..10c1ae3a60d864 100644 --- a/srcpkgs/beets/patches/3eb68ef830447d91b10a928823edb3c50cf73f48.patch +++ b/srcpkgs/beets/patches/3eb68ef830447d91b10a928823edb3c50cf73f48.patch @@ -52,15 +52,3 @@ index 60e2014485..fe980bb5cf 100644 + columns, _ = shutil.get_terminal_size(fallback=(0, 0)) + return columns if columns else config["ui"]["terminal_width"].get(int) - - def split_into_lines(string, width_tuple): ---- a/beets/ui/__init__.py -+++ b/beets/ui/__init__.py -@@ -27,6 +27,7 @@ - import textwrap - import traceback - from difflib import SequenceMatcher -+from functools import cache - from typing import Any, Callable - - import confuse diff --git a/srcpkgs/beets/patches/fix-reflink.patch b/srcpkgs/beets/patches/fix-reflink.patch new file mode 100644 index 00000000000000..a4f8e9f735cdc4 --- /dev/null +++ b/srcpkgs/beets/patches/fix-reflink.patch @@ -0,0 +1,11 @@ +--- a/beets/util/__init__.py ++++ b/beets/util/__init__.py +@@ -610,6 +610,10 @@ def reflink( + Otherwise, errors are re-raised as FilesystemError with an explanation. + """ ++ # Convert Path-like objects to bytes ++ path = syspath(path) ++ dest = syspath(dest) ++ + if samefile(path, dest): + return diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index 2db8a7722abb89..dfd33e304a4ff1 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -1,7 +1,7 @@ # Template file for 'beets' pkgname=beets -version=2.3.1 -revision=3 +version=2.5.1 +revision=1 build_style=python3-pep517 # tests requires unpackaged librosa, pytest-flask make_check_args="--ignore=test/plugins/test_autobpm.py @@ -9,24 +9,19 @@ make_check_args="--ignore=test/plugins/test_autobpm.py hostmakedepends="python3-poetry-core python3-Sphinx" depends="python3-lap python3-musicbrainzngs python3-Unidecode python3-yaml python3-jellyfish python3-mediafile python3-confuse python3-platformdirs - python3-numpy" + python3-numpy python3-typing_extensions" checkdepends="$depends python3-BeautifulSoup4 python3-Flask python3-mock python3-pylast python3-pytest python3-pytest-cov python3-mpd2 python3-xdg python3-responses python3-requests-oauthlib python3-reflink python3-rarfile - python3-discogs_client python3-py7zr python3-typing_extensions - python3-dateutil python3-gobject gstreamer1 ffmpeg" + python3-discogs_client python3-py7zr python3-dateutil python3-gobject + gstreamer1 ffmpeg" short_desc="Media library management system for obsessive-compulsive music geeks" maintainer="Joel Beckmeyer " license="MIT" homepage="https://beets.io" changelog="https://raw.githubusercontent.com/beetbox/beets/master/docs/changelog.rst" distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=87598721a14af89a06d5ad3d9e8138f8ac112510271a981a90b840ed784d5712 - -pre_check() { - # https://github.com/beetbox/beets/issues/5770 - touch test/rsrc/full.mp3 -} +checksum=7feefd70804fbcf26516089f472bac34c6a77e8e20ec539252fd1bafc91de9a2 post_install() { vman man/beet.1 diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template index 6d3ebd9f64af17..225a43dfc271c7 100644 --- a/srcpkgs/python3-reflink/template +++ b/srcpkgs/python3-reflink/template @@ -1,7 +1,7 @@ # Template file for 'python3-reflink' pkgname=python3-reflink -version=0.2.1 -revision=5 +version=0.2.2 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel python3-cffi" @@ -11,7 +11,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://gitlab.com/rubdos/pyreflink" distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz" -checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a +checksum=882375ee7319275ae5f6a6a1287406365dac1e9643b91ad10e5187d3f84253bd # test suite includes calls to mount/umount and writing to /dev which fail due # to chroot-util-linux not including mount/umount and no permissions, # respectively