From a8db2cb547f93f915726eae8ebae7646a4361094 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Fri, 7 Mar 2025 15:09:42 +0100 Subject: [PATCH] gnu: qemu-7.2.4: Unregister patch. * gnu/packages/patches/qemu-7.2.4-build-info-manual.patch: Remove patch. * gnu/local.mk: Unregister patch. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - .../qemu-7.2.4-build-info-manual.patch | 62 ------------------- 2 files changed, 63 deletions(-) delete mode 100644 gnu/packages/patches/qemu-7.2.4-build-info-manual.patch diff --git a/gnu/local.mk b/gnu/local.mk index 997b7344ffff821712f48023b414a234e8e35682..be1e32571cffd7a69f8284f3b2101851f7194a1b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2139,7 +2139,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-versioneer-guix-support.patch \ %D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch \ - %D%/packages/patches/qemu-7.2.4-build-info-manual.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-disable-bios-tables-test.patch \ %D%/packages/patches/qemu-disable-migration-test.patch \ diff --git a/gnu/packages/patches/qemu-7.2.4-build-info-manual.patch b/gnu/packages/patches/qemu-7.2.4-build-info-manual.patch deleted file mode 100644 index ff28266aaa76007d15a1821c049600747594b130..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/qemu-7.2.4-build-info-manual.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 2793f47c066ed396b38893c10533202fceb1a05f Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 17 Sep 2020 13:28:19 -0400 -Subject: [PATCH] build: Build and install a Texinfo version of the manual. - -Take advantage of the Sphinx texinfo backend to generate a QEMU info -manual. The Texinfo format allows for more structure and info readers -provide more advanced navigation capabilities compared to manpages -readers. - -* docs/meson.build (texi, info): New targets. - -Signed-off-by: Maxim Cournoyer - -diff --git a/docs/meson.build b/docs/meson.build ---- a/docs/meson.build -+++ b/docs/meson.build -@@ -92,4 +92,25 @@ if build_docs - alias_target('sphinxdocs', sphinxdocs) - alias_target('html', sphinxdocs) - alias_target('man', sphinxmans) -+ -+ # Generate a Texinfo version of the QEMU manual. -+ makeinfo = find_program(['texi2any', 'makeinfo']) -+ if makeinfo.found() -+ sphinxtexi = custom_target( -+ 'QEMU manual generated texinfo source', -+ output: ['QEMU.texi', 'sphinxtexi.stamp'], -+ depfile: 'sphinxtexi.d', -+ command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', -+ '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo', -+ meson.current_source_dir(), meson.current_build_dir()]) -+ sphinxinfo = custom_target( -+ 'QEMU info manual', -+ input: sphinxtexi, -+ output: 'QEMU.info', -+ install: true, -+ install_dir: get_option('infodir'), -+ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) -+ alias_target('texi', sphinxtexi) -+ alias_target('info', sphinxinfo) -+ endif - endif -diff --git a/meson.build b/meson.build ---- a/meson.build -+++ b/meson.build -@@ -37,6 +37,7 @@ endif - qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix') - qemu_datadir = get_option('datadir') / get_option('qemu_suffix') - qemu_docdir = get_option('docdir') / get_option('qemu_suffix') -+qemu_infodir = get_option('infodir') / get_option('qemu_suffix') - qemu_moddir = get_option('libdir') / get_option('qemu_suffix') - - qemu_desktopdir = get_option('datadir') / 'applications' -@@ -3698,6 +3699,7 @@ else - summary_info += {'local state directory': 'queried at runtime'} - endif - summary_info += {'Doc directory': get_option('prefix') / get_option('docdir')} -+summary_info += {'Info directory': get_option('prefix') / get_option('infodir')} - summary_info += {'Build directory': meson.current_build_dir()} - summary_info += {'Source path': meson.current_source_dir()} - summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}