From b3ce8bbed78b0651008ec4c5e40df1de8e0f5052 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 19 Sep 2020 08:31:53 +0100 Subject: app-emulation/qemu: drop upstreamed patch This reverts commit 3752d632441c34385ee7296126e3867536cb63e7. Bug: https://bugs.gentoo.org/740836 Signed-off-by: Sergei Trofimovich --- app-emulation/qemu/files/qemu-9999-format-error.patch | 14 -------------- app-emulation/qemu/qemu-9999.ebuild | 1 - 2 files changed, 15 deletions(-) delete mode 100644 app-emulation/qemu/files/qemu-9999-format-error.patch (limited to 'app-emulation/qemu') diff --git a/app-emulation/qemu/files/qemu-9999-format-error.patch b/app-emulation/qemu/files/qemu-9999-format-error.patch deleted file mode 100644 index 8bb4d96b77cf..000000000000 --- a/app-emulation/qemu/files/qemu-9999-format-error.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/740836 ---- a/meson.build -+++ b/meson.build -@@ -255,8 +255,8 @@ if sdl.found() - method: 'pkg-config', static: enable_static) - else - if get_option('sdl_image').enabled() -- error('sdl-image required, but SDL was @0@', -- get_option('sdl').disabled() ? 'disabled' : 'not found') -+ error('sdl-image required, but SDL was @0@'.format( -+ get_option('sdl').disabled() ? 'disabled' : 'not found')) - endif - sdl_image = not_found - endif diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index df162166cbf8..c46858db4978 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -226,7 +226,6 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-9999-cflags.patch - "${FILESDIR}"/${PN}-9999-format-error.patch ) QA_PREBUILT=" -- cgit v1.2.3-65-gdbad