[gentoo-commits] repo/gentoo:master commit in: media-libs/mutagen/files/, media-libs/mutagen/

[gentoo-commits] repo/gentoo:master commit in: media-libs/mutagen/files/, media-libs/mutagen/

[Sam James]

commit:     b6cddbc046b2471b0f5a441025f2d03bf4320f4d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 10:11:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 10:17:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6cddbc0

media-libs/mutagen: fix build w/ sphinx 6

Closes: https://bugs.gentoo.org/889354
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../mutagen/files/mutagen-1.46.0-sphinx-6.patch    | 41 ++++++++++++++++++++++
 media-libs/mutagen/mutagen-1.46.0.ebuild           |  6 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/media-libs/mutagen/files/mutagen-1.46.0-sphinx-6.patch b/media-libs/mutagen/files/mutagen-1.46.0-sphinx-6.patch
new file mode 100644
index 000000000000..fe11fa6b1d46
--- /dev/null
+++ b/media-libs/mutagen/files/mutagen-1.46.0-sphinx-6.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/889354
+https://github.com/quodlibet/mutagen/pull/590
+
+From 37b4e6bddc03e1f715425c418ea84bac15116907 Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Tue, 3 Jan 2023 17:32:55 +0100
+Subject: [PATCH] docs: Make extlinks compatible with sphinx 6.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The caption must contain `%s` exactly once¹ and because it did not
+building the docs using sphinx 6.0 failed.
+
+```
+mutagen> reading sources... [ 62%] changelog0mmm00m
+mutagen> Exception occurred:
+mutagen>   File "/nix/store/45b9bmcr6w6k05syyflc4r8j4gzzbjkm-python3.10-sphinx-6.0.0/lib/python3.10/site-packages/sphinx/ext/extlinks.py", line 101, in role
+mutagen>     title = caption % part
+mutagen> TypeError: not all arguments converted during string formatting
+mutagen> The full traceback has been saved in /build/sphinx-err-kzqq6ki_.log, if you want to report the issue to the developers.
+```
+
+[1] https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html#confval-extlinks
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -26,10 +26,10 @@
+ exclude_patterns = ['_build']
+ 
+ extlinks = {
+-    'bug': ('https://github.com/quodlibet/mutagen/issues/%s', '#'),
+-    'pr': ('https://github.com/quodlibet/mutagen/pull/%s', '#pr'),
+-    'commit': ('https://github.com/quodlibet/mutagen/commit/%s', '#'),
+-    'user': ('https://github.com/%s', ''),
++    'bug': ('https://github.com/quodlibet/mutagen/issues/%s', '#%s'),
++    'pr': ('https://github.com/quodlibet/mutagen/pull/%s', '#pr%s'),
++    'commit': ('https://github.com/quodlibet/mutagen/commit/%s', '%s'),
++    'user': ('https://github.com/%s', '%s'),
+ }
+ 
+ 

diff --git a/media-libs/mutagen/mutagen-1.46.0.ebuild b/media-libs/mutagen/mutagen-1.46.0.ebuild
index 64db60e6f2ca..63c163f649b3 100644
--- a/media-libs/mutagen/mutagen-1.46.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.46.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,10 @@ BDEPEND="
 
 DOCS=( NEWS README.rst )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.0-sphinx-6.patch
+)
+
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme