From 23d942a1732563ad036aa391a667f2ba4f0d7296 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 15:28:54 -0400 Subject: [PATCH 1/9] python3-Brotli: update to 1.1.0. --- .../patches/missing-test-cases.patch | 16 ---------------- .../patches/use-system-brotli.patch | 15 +++++++++------ srcpkgs/python3-Brotli/template | 6 +++--- 3 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/python3-Brotli/patches/missing-test-cases.patch diff --git a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch deleted file mode 100644 index cbefb7557a2d4c..00000000000000 --- a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py -index 104e654..6cf12b0 100644 ---- a/python/tests/_test_utils.py -+++ b/python/tests/_test_utils.py -@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata') - - TESTDATA_FILES = [ - 'empty', # Empty file -- '10x10y', # Small text -- 'alice29.txt', # Large text -- 'random_org_10k.bin', # Small data -- 'mapsdatazrh', # Large data -+ 'ukkonooa', # Small text - ] - - TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES] diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch index d24964295cb07f..6c3290b9adffc9 100644 --- a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch +++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch @@ -1,15 +1,16 @@ diff --git a/setup.py b/setup.py -index 25626ec..fdf27a2 100644 +index 2cb89c3..748ecc5 100644 --- a/setup.py +++ b/setup.py -@@ -181,93 +181,18 @@ EXT_MODULES = [ +@@ -177,96 +177,17 @@ EXT_MODULES = [ '_brotli', sources=[ - 'python/_brotli.cc', + 'python/_brotli.c', - 'c/common/constants.c', - 'c/common/context.c', - 'c/common/dictionary.c', - 'c/common/platform.c', +- 'c/common/shared_dictionary.c', - 'c/common/transform.c', - 'c/dec/bit_reader.c', - 'c/dec/decode.c', @@ -22,6 +23,7 @@ index 25626ec..fdf27a2 100644 - 'c/enc/brotli_bit_stream.c', - 'c/enc/cluster.c', - 'c/enc/command.c', +- 'c/enc/compound_dictionary.c', - 'c/enc/compress_fragment.c', - 'c/enc/compress_fragment_two_pass.c', - 'c/enc/dictionary_hash.c', @@ -41,6 +43,7 @@ index 25626ec..fdf27a2 100644 - 'c/common/context.h', - 'c/common/dictionary.h', - 'c/common/platform.h', +- 'c/common/shared_dictionary_internal.h', - 'c/common/transform.h', 'c/common/version.h', - 'c/dec/bit_reader.h', @@ -59,6 +62,7 @@ index 25626ec..fdf27a2 100644 - 'c/enc/cluster.h', - 'c/enc/cluster_inc.h', - 'c/enc/command.h', +- 'c/enc/compound_dictionary.h', - 'c/enc/compress_fragment.h', - 'c/enc/compress_fragment_two_pass.h', - 'c/enc/dictionary_hash.h', @@ -92,12 +96,11 @@ index 25626ec..fdf27a2 100644 ], include_dirs=[ 'c/include', - ], ++ ], + libraries=[ + 'brotlicommon', + 'brotlidec', + 'brotlienc', -+ ], - language='c++'), + ]), ] diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template index 3c792b3886786a..d2b86573d87d81 100644 --- a/srcpkgs/python3-Brotli/template +++ b/srcpkgs/python3-Brotli/template @@ -1,7 +1,7 @@ # Template file for 'python3-Brotli' pkgname=python3-Brotli -version=1.0.9 -revision=3 +version=1.1.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel brotli-devel" @@ -11,7 +11,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://github.com/google/brotli" distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz" -checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46 +checksum=e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff post_install() { vlicense LICENSE From e3c73ed1c6b8ebcbc48065dfc7e57f3db542254c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 15:34:00 -0400 Subject: [PATCH 2/9] python3-inflate64: update to 1.0.0. --- srcpkgs/python3-inflate64/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-inflate64/template b/srcpkgs/python3-inflate64/template index cee90688e3a907..d6788064d9988e 100644 --- a/srcpkgs/python3-inflate64/template +++ b/srcpkgs/python3-inflate64/template @@ -1,7 +1,7 @@ # Template file for 'python3-inflate64' pkgname=python3-inflate64 -version=0.3.1 -revision=2 +version=1.0.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" @@ -13,4 +13,4 @@ license="LGPL-2.1-or-later" homepage="https://codeberg.org/miurahr/inflate64" changelog="https://codeberg.org/miurahr/inflate64/raw/branch/main/docs/Changelog.rst" distfiles="${PYPI_SITE}/i/inflate64/inflate64-${version}.tar.gz" -checksum=b52dd8fefd2ba179e5dfa18d6eca7e2fc822584616271c039d5ef1f9ca90c71c +checksum=3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b804bc2d From 757f9d79423bf5e3696d122f22a76f9ab123d34e Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 15:33:11 -0400 Subject: [PATCH 3/9] python3-pybcj: update to 1.0.2. --- srcpkgs/python3-pybcj/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template index 09a1ab78503bf5..4831758cf29d46 100644 --- a/srcpkgs/python3-pybcj/template +++ b/srcpkgs/python3-pybcj/template @@ -1,7 +1,7 @@ # Template file for 'python3-pybcj' pkgname=python3-pybcj -version=1.0.1 -revision=3 +version=1.0.2 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" @@ -13,4 +13,4 @@ license="LGPL-2.1-or-later" homepage="https://codeberg.org/miurahr/pybcj" changelog="https://codeberg.org/miurahr/pybcj/raw/branch/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz" -checksum=8b682ed08caabfb7c042d4be083e28ddc692afb1deff5567111f8855071b75c3 +checksum=c7f5bef7f47723c53420e377bc64d2553843bee8bcac5f0ad076ab1524780018 From 98e588b96c3b12f72a55708f4232b96a4beee8c1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 15:33:32 -0400 Subject: [PATCH 4/9] python3-pyppmd: update to 1.1.0. --- srcpkgs/python3-pyppmd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template index 446bff356222ce..6a54ffabc73efc 100644 --- a/srcpkgs/python3-pyppmd/template +++ b/srcpkgs/python3-pyppmd/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyppmd' pkgname=python3-pyppmd -version=1.0.0 -revision=3 +version=1.1.0 +revision=1 build_style=python3-module make_check_args="--noconftest --ignore=tests/test_benchmark.py" hostmakedepends="python3-setuptools_scm" @@ -14,4 +14,4 @@ license="LGPL-2.0-or-later" homepage="https://codeberg.org/miurahr/pyppmd" changelog="https://codeberg.org/miurahr/pyppmd/raw/branch/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz" -checksum=075c9bd297e3b0a87dd7aeabca7fee668218acbe69ecc1c6511064558de8840f +checksum=1d38ce2e4b7eb84b53bc8a52380b94f66ba6c39328b8800b30c2b5bf31693973 From 9ae7a3510cfb8442aa986b9d2e89d8a5d4cf9a91 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 15:33:48 -0400 Subject: [PATCH 5/9] python3-pyzstd: update to 0.16.0. --- srcpkgs/python3-pyzstd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template index b70306e7f08335..daba86a8a46239 100644 --- a/srcpkgs/python3-pyzstd/template +++ b/srcpkgs/python3-pyzstd/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyzstd' pkgname=python3-pyzstd -version=0.15.7 -revision=2 +version=0.16.0 +revision=1 build_style=python3-module make_build_args="--dynamic-link-zstd" hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://github.com/animalize/pyzstd" changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst" distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz" -checksum=55e503f28f5a9d225ce9d0639e3f5b1801bacace5aea926ec2998e73c5150fe7 +checksum=fd43a0ae38ae15223fb1057729001829c3336e90f4acf04cf12ebdec33346658 post_install() { vlicense LICENSE From a2cc87ab0bc6d6264950d860833314a81ae14cc5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 12:02:56 -0400 Subject: [PATCH 6/9] python3-py7zr: update to 0.21.0. --- srcpkgs/python3-py7zr/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template index 81ef3d8eb1aded..f8a9da49b26614 100644 --- a/srcpkgs/python3-py7zr/template +++ b/srcpkgs/python3-py7zr/template @@ -1,24 +1,24 @@ # Template file for 'python3-py7zr' pkgname=python3-py7zr -version=0.20.5 -revision=2 +version=0.21.0 +revision=1 build_style=python3-pep517 # - test_concurrent.py fails on timeout. This test downloads several different # 7z archives; likely failing due to slow download or dead links - # tests/test_misc.py::test_extract_high_compression_rate fails only in chroot, # but passes when run on my system -make_check_args="--ignore=tests/test_benchmark.py --noconftest - --ignore=tests/test_concurrent.py +make_check_args="--ignore=tests/test_concurrent.py --deselect=tests/test_misc.py::test_extract_high_compression_rate" hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-texttable python3-pycryptodomex python3-Brotli python3-psutil python3-pyzstd python3-pyppmd python3-pybcj python3-multivolumefile python3-inflate64" -checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends" +checkdepends="python3-pytest python3-pytest-timeout python3-pytest-benchmark + python3-py-cpuinfo $depends" short_desc="7zip in python3 with various compressions, and AES encryption" maintainer="Joel Beckmeyer " license="LGPL-2.1-or-later" homepage="https://github.com/miurahr/py7zr" changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/docs/Changelog.rst" distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz" -checksum=6fb4889c0fa32581818a3366984083253585d6c794e82c3242b8a12d6aeaabd3 +checksum=213a9cc46940fb8f63b4163643a8f5b36bbc798134746c3992d3bc6b14edab87 From 17ac7ac4dbab69b2c72ada9e9906c334154ba07a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 11:54:04 -0400 Subject: [PATCH 7/9] python3-mediafile: update to 0.12.0. --- srcpkgs/python3-mediafile/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template index de6d4c04213f8b..ad750edbe0a4a0 100644 --- a/srcpkgs/python3-mediafile/template +++ b/srcpkgs/python3-mediafile/template @@ -1,9 +1,9 @@ # Template file for 'python3-mediafile' pkgname=python3-mediafile -version=0.9.0 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=0.12.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core" depends="python3-mutagen python3-six" checkdepends="${depends} python3-pytest" short_desc="Read and write audio files' tags in Python" @@ -11,7 +11,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://github.com/beetbox/mediafile" distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz" -checksum=93ccef3fbb7d4554a0e7689d41236cd5686a2f2f17493098622b8344cf83df9a +checksum=d75d805a06ed56150dbcea76505e700f9809abd9e98f98117ae46f5df2ccf1d7 post_install() { vlicense LICENSE From 7e48225b7edbbdc29ad4b3f4da36cf9426154126 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 11:54:18 -0400 Subject: [PATCH 8/9] python3-jellyfish: update to 1.0.4. --- srcpkgs/python3-jellyfish/template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template index 70d8e2ac082f04..1c58c85edf64a1 100644 --- a/srcpkgs/python3-jellyfish/template +++ b/srcpkgs/python3-jellyfish/template @@ -1,10 +1,9 @@ # Template file for 'python3-jellyfish' pkgname=python3-jellyfish -version=0.9.0 -revision=3 -build_style=python3-module -make_check_target=build/lib.*/jellyfish/test.py -hostmakedepends=" python3-setuptools" +version=1.0.4 +revision=1 +build_style=python3-pep517 +hostmakedepends="maturin cargo" makedepends="python3-devel" depends="python3" checkdepends="python3-pytest" @@ -14,7 +13,15 @@ license="BSD-2-Clause" homepage="https://jamesturk.github.io/jellyfish/" changelog="https://raw.githubusercontent.com/jamesturk/jellyfish/main/docs/changelog.md" distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz" -checksum=40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a +checksum=72aabb3bedd513cdd20712242fd51173b59972c0b146b7a0b9c6f32f1656293f + +# taken from python3-adblock +if [ "$CROSS_BUILD" ]; then + makedepends+=" rust-std" + hostmakedepends+=" python3-typing_extensions" + export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" + export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" +fi post_install() { vlicense LICENSE From 668fd892693867bc90f91ab2811263234fa2daa7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 May 2024 11:54:38 -0400 Subject: [PATCH 9/9] beets: update to 2.0.0. --- srcpkgs/beets/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index 827b85c0239568..7929ec34327560 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -1,13 +1,13 @@ # Template file for 'beets' pkgname=beets -version=1.6.0 -revision=4 +version=2.0.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml python3-jellyfish python3-mediafile python3-confuse" -checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask - python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg +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" short_desc="Media library management system for obsessive-compulsive music geeks" @@ -16,7 +16,7 @@ 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=aa6fb734e44afc9b039c0abd0edd4c7706df00d4eb4aae7afa9ff4b6bb15525d +checksum=3b1172b5bc3729e33a6ea4689f7d0236682bf828c67196b6a260f0389cb1f8cf make_check=ci-skip # tests don't work as root post_install() {