diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-17 19:17:17 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:09:51 +0200 |
| commit | 2b2ecbace4cf404cc4541be16bdc04d2d9ba88c3 (patch) | |
| tree | c16d58bff9730a4ab7a9da4349250469d414342e /gnu | |
| parent | 07d91d34d2d7a9b8f1d4ab5b3a0a1191b054d379 (diff) | |
| download | guix-patches-2b2ecbace4cf404cc4541be16bdc04d2d9ba88c3.tar guix-patches-2b2ecbace4cf404cc4541be16bdc04d2d9ba88c3.tar.gz | |
gnu: QEMU: Adjust for Sphinx 4.0.
* gnu/packages/patches/qemu-sphinx-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/virtualization.scm (qemu)[source](patches): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/qemu-sphinx-compat.patch | 18 | ||||
| -rw-r--r-- | gnu/packages/virtualization.scm | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index fec88aa3a2..4d9afd5354 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1634,6 +1634,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ %D%/packages/patches/qemu-meson-compat.patch \ + %D%/packages/patches/qemu-sphinx-compat.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ diff --git a/gnu/packages/patches/qemu-sphinx-compat.patch b/gnu/packages/patches/qemu-sphinx-compat.patch new file mode 100644 index 0000000000..7342ebee4e --- /dev/null +++ b/gnu/packages/patches/qemu-sphinx-compat.patch @@ -0,0 +1,18 @@ +Prevent Sphinx 4 and later from creating subdirectories, which +the build scripts are not equipped to deal with. + +Taken from upstream: +https://gitlab.com/qemu-project/qemu/-/issues/256 +https://gitlab.com/qemu-project/qemu/-/commit/269a7e97865cb863c9ca19e5f2e6a40ac9eddf82 + +diff --git a/docs/conf.py b/docs/conf.py +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -279,6 +279,7 @@ + ['Stefan Hajnoczi <stefanha@redhat.com>', + 'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1), + ] ++man_make_section_directory = False + + # -- Options for Texinfo output ------------------------------------------- + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e34fb2d738..600e4f401a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -153,6 +153,7 @@ "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47")) (patches (search-patches "qemu-CVE-2021-20203.patch" "qemu-meson-compat.patch" + "qemu-sphinx-compat.patch" "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet |