diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2021-05-12 07:54:50 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2021-05-12 07:55:14 +0100 |
| commit | 65b728346b8f8833906f796f16bafb8361931879 (patch) | |
| tree | 72a392c9ee36233a54a7267136f9277751305ad8 /app-emulation | |
| parent | media-sound/picard: bump to 2.6.2 (diff) | |
| download | gentoo-65b728346b8f8833906f796f16bafb8361931879.tar.gz gentoo-65b728346b8f8833906f796f16bafb8361931879.tar.bz2 gentoo-65b728346b8f8833906f796f16bafb8361931879.zip | |
app-emulation/qemu: apply sphinx-4 workaround
Reported-by: Ionen Wolkens
Closes: https://bugs.gentoo.org/789561
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch | 35 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-6.0.0.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch new file mode 100644 index 000000000000..2a1e6f9f5f43 --- /dev/null +++ b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch @@ -0,0 +1,35 @@ +https://patchew.org/QEMU/20210503161422.15028-1-dgouttegattat@incenp.org/ +https://gitlab.com/qemu-project/qemu/-/issues/256 +https://bugs.gentoo.org/789561 + +From c1155afabf1a3e093049975ba1748cf39734aa52 Mon Sep 17 00:00:00 2001 +From: Damien Goutte-Gattat via <qemu-devel@nongnu.org> +Date: Mon, 3 May 2021 17:14:22 +0100 +Subject: [PATCH] docs: Fix installation of man pages with Sphinx 4.x + +The 4.x branch of Sphinx introduces a breaking change, as generated man +pages are now written to subdirectories corresponding to the manual +section they belong to. This results in `make install` erroring out when +attempting to install the man pages, because they are not where it +expects to find them. + +This patch restores the behavior of Sphinx 3.x regarding man pages. + +Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org> +--- + docs/conf.py | 1 + + 1 file changed, 1 insertion(+) + +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -269,6 +269,7 @@ + ['Stefan Hajnoczi <stefanha@redhat.com>', + 'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1), + ] ++man_make_section_directory = False + + # -- Options for Texinfo output ------------------------------------------- + +-- +2.31.1 + diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild index 591f58deeb83..fe66557d5cf6 100644 --- a/app-emulation/qemu/qemu-6.0.0.ebuild +++ b/app-emulation/qemu/qemu-6.0.0.ebuild @@ -274,6 +274,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch + "${FILESDIR}"/${PN}-6.0.0-sphinx-4.patch ) QA_PREBUILT=" |