From 702bc2b89939165a3dc61096c21bb8b670a94713 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Oct 2021 19:24:50 +0200 Subject: [PATCH] gnu: QEMU: Remove obsolete patch. * gnu/packages/virtualization.scm (qemu)[source](patches): Remove Sphinx compatibility patch, which worked around a bug in Sphinx that has since been fixed. * gnu/packages/patches/qemu-sphinx-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/patches/qemu-sphinx-compat.patch | 18 ------------------ gnu/packages/virtualization.scm | 1 - 3 files changed, 20 deletions(-) delete mode 100644 gnu/packages/patches/qemu-sphinx-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b7e7f4d4319f2e1fbd0639d21872c2a8c3085d2..ea27741a77d1db5770b2984b7f5d0a15ad0585f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1689,7 +1689,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.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 deleted file mode 100644 index 7342ebee4e92113cb0c6ae7450dfc4ac70b55d03..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/qemu-sphinx-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 ', - 'Masayoshi Mizuma '], 1), - ] -+man_make_section_directory = False - - # -- Options for Texinfo output ------------------------------------------- - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 504f19929688dcafef76a5a2df290e207a459557..772a0ac430a947859584afc838287391c34eb7e4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -159,7 +159,6 @@ (base32 "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")) (patches (search-patches "qemu-CVE-2021-20203.patch" - "qemu-sphinx-compat.patch" "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet