commit: 5a676e6198e558a1d71b36028e3face9e614ea33 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 20 04:11:30 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 20 04:11:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a676e61
dev-libs/libinput: fix build w/ sphinx 6 Closes: https://bugs.gentoo.org/889908 Bug: https://bugs.gentoo.org/891371 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libinput/files/libinput-1.22.1-sphinx-6.patch | 28 ++++++++++++++++++++++ dev-libs/libinput/libinput-1.22.1.ebuild | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch b/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch new file mode 100644 index 000000000000..737ac3965c7a --- /dev/null +++ b/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/891371 +https://bugs.gentoo.org/889908 +https://gitlab.freedesktop.org/libinput/libinput/-/commit/bf2e8a406e6ebfdb62ffa67f00822c17ff9b2c6a + +From bf2e8a406e6ebfdb62ffa67f00822c17ff9b2c6a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue, 17 Jan 2023 12:28:58 +1000 +Subject: [PATCH] doc/user: fix sphinx warning + +WARNING: extlinks: Sphinx-6.0 will require a caption string to contain +exactly one '%s' and all other '%' need to be escaped as '%%'. + +Well, let's do that then! + +Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> +--- a/doc/user/conf.py.in ++++ b/doc/user/conf.py.in +@@ -169,7 +169,7 @@ from recommonmark.parser import CommonMarkParser + + extlinks = { 'commit' : + ('https://gitlab.freedesktop.org/libinput/libinput/commit/%s', +- 'git commit ') ++ 'git commit %s') + } + + # -- git version hack ------------------------------------------------- +-- +GitLab diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild index a6741dc43f7b..70cad76124a2 100644 --- a/dev-libs/libinput/libinput-1.22.1.ebuild +++ b/dev-libs/libinput/libinput-1.22.1.ebuild @@ -44,6 +44,10 @@ BDEPEND=" " # test? ( dev-util/valgrind ) +PATCHES=( + "${FILESDIR}"/${P}-sphinx-6.patch +) + python_check_deps() { python_has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \ python_has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \