aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-04-25 17:39:54 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-04-25 17:44:39 +0200
commit7e641e4796b714d7b9b8a231cf31ab19c580154c (patch)
tree857b3bdef4054df59b2b80c7bd53077ff39d20a2
parent039daa07c6a2ed85e094cdee8c35236a2c800176 (diff)
downloadaports-7e641e4796b714d7b9b8a231cf31ab19c580154c.tar.gz
aports-7e641e4796b714d7b9b8a231cf31ab19c580154c.tar.bz2
aports-7e641e4796b714d7b9b8a231cf31ab19c580154c.tar.xz
community/beets: Backport fix for web plugin with recent py3-werkzeug
See https://github.com/beetbox/beets/issues/3565
-rw-r--r--community/beets/0001-Try-to-work-around-a-Werkzeug-change.patch22
-rw-r--r--community/beets/APKBUILD8
2 files changed, 27 insertions, 3 deletions
diff --git a/community/beets/0001-Try-to-work-around-a-Werkzeug-change.patch b/community/beets/0001-Try-to-work-around-a-Werkzeug-change.patch
new file mode 100644
index 0000000000..d2b7beca71
--- /dev/null
+++ b/community/beets/0001-Try-to-work-around-a-Werkzeug-change.patch
@@ -0,0 +1,22 @@
+From d43d54e21cde97f57f19486925ab56b419254cc8 Mon Sep 17 00:00:00 2001
+From: Adrian Sampson <adrian@radbox.org>
+Date: Thu, 6 Feb 2020 22:22:54 -0500
+Subject: [PATCH] Try to work around a Werkzeug change?
+
+---
+ beetsplug/web/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py
+index f53fb3a9..21ff5d94 100644
+--- a/beetsplug/web/__init__.py
++++ b/beetsplug/web/__init__.py
+@@ -169,7 +169,7 @@ class IdListConverter(BaseConverter):
+ return ids
+
+ def to_url(self, value):
+- return ','.join(value)
++ return ','.join(str(v) for v in value)
+
+
+ class QueryConverter(PathConverter):
diff --git a/community/beets/APKBUILD b/community/beets/APKBUILD
index 30a0b7e152..f5ed902383 100644
--- a/community/beets/APKBUILD
+++ b/community/beets/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=beets
pkgver=1.4.9
-pkgrel=2
+pkgrel=3
pkgdesc="Music library manager and MusicBrainz tagger"
options="!check" # Requires unpackaged dependencies
url="https://beets.io"
@@ -13,7 +13,8 @@ subpackages="$pkgname-doc"
makedepends="py3-sphinx"
depends="python3 py3-mutagen py3-unidecode py3-musicbrainzngs py3-munkres
py3-setuptools py3-yaml py3-jellyfish py3-six"
-source="https://github.com/sampsyo/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/sampsyo/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
+ 0001-Try-to-work-around-a-Werkzeug-change.patch"
build() {
# sdist := source distribution tarball, builds man pages
@@ -30,4 +31,5 @@ package() {
done
}
-sha512sums="616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a beets-1.4.9.tar.gz"
+sha512sums="616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a beets-1.4.9.tar.gz
+7f2669345ef89a4f2cd8688f9e3a11d208ebebf2f44e684bf29f1f1f5102d08bdd8707e6df46a311843a86c5aa074b769420f07af7460e69bcb2d149bde933a7 0001-Try-to-work-around-a-Werkzeug-change.patch"