From e45f0df9d7f9f5260e69235b8c7c6e00153747f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Jan 2023 11:48:35 +0000 Subject: gentoo auto-resync : 13:01:2023 - 11:48:35 --- media-libs/mutagen/Manifest | 3 +- .../mutagen/files/mutagen-1.46.0-sphinx-6.patch | 41 ++++++++++++++++++++++ media-libs/mutagen/mutagen-1.46.0.ebuild | 6 +++- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 media-libs/mutagen/files/mutagen-1.46.0-sphinx-6.patch (limited to 'media-libs/mutagen') diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest index ca8382691024..8874962976e1 100644 --- a/media-libs/mutagen/Manifest +++ b/media-libs/mutagen/Manifest @@ -1,3 +1,4 @@ +AUX mutagen-1.46.0-sphinx-6.patch 1697 BLAKE2B 3cb99be12abec75a237965262f65a77914cbf2061c910781c31d538f9ea17aac5de7074d637b1b624e25b9b12e04605f7d652f0cbac505bc3ad51cbcc8438ef2 SHA512 73692d3cbfd0afca03cc3c2972b3f686a8a3fae0a624c8d6cbfaa0455406c60fc79da3d97e24980e5d2c235e3aa91daf6774d88247e7c95d46f0baced631cb9a DIST mutagen-1.46.0.tar.gz 1268561 BLAKE2B 44e0dbbc1c102521569a91386a9d807f3ad82ffb96a5e3f76958551d173d00c7095fa6a2668a0a418bfdda31be5c3bb175856b2278719007bf7af866c732dc40 SHA512 52ab7408af46e54e79f1d157a3f6114e2606c6a55eb46fdd314dff82d6d586c2c22294b181a432581230dee566c79554456a9435a8e1188a91f4ae000644ae71 -EBUILD mutagen-1.46.0.ebuild 823 BLAKE2B c3f2cd3a289ca54fe75cf36b80d2c02dc1bfbefb756f6456ef311447bddffad788c19ff99d10ffc3aa8d2ced1d0bcc586ed1729aa48ec4ed696b3a9d5b4b0279 SHA512 f29fffb3aace5fc511e90fedd4d881410fb9a356273ff39516b7067e3cc6fcec78f21a470f130a698b28f5d4c5069f0a7f04dec08addb1aec6332918eae6211d +EBUILD mutagen-1.46.0.ebuild 879 BLAKE2B c1e1eab2099baeefa805c10d399ec638579dc383964a5d034aa077489a5dff30dba123e187bcd6d93e77c24474c5326ae8f5fac776de3d5e81eb2ad562e30b3f SHA512 9b28b03b2f53c520b758511cb8ff9a8d50521401be863a6880c41fc138a90733748f0e945201f44ac330e195dcc39ac5f4324477200bf881043869e0b7c43835 MISC metadata.xml 482 BLAKE2B 3ae30f618d887acb7bcabfb63ceafd422ee356b1a2f0b812dd51196e1a3e4f5afd6fc2c5fb36ff137060d710a8a7e1800ff25e2246a6dd4bb5dc3301cd559171 SHA512 13450efc95ce24cacf3c882c78acb2605c10bd803e1b63a700bd6a7bff103946f905ef39e15bc2b86e7302940c7b0a6fe9a5767c8de51f77ee1f11cfc31bfa6f 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 +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 -- cgit v1.2.3