diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-09-19 08:31:53 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-09-19 08:33:01 +0100 |
| commit | b3ce8bbed78b0651008ec4c5e40df1de8e0f5052 (patch) | |
| tree | bf410c81b413be9c37947e26d828bc04a25e7fe1 /app-emulation/qemu | |
| parent | app-admin/syslog-summary: Mark ALLARCHES (diff) | |
| download | gentoo-b3ce8bbed78b0651008ec4c5e40df1de8e0f5052.tar.gz gentoo-b3ce8bbed78b0651008ec4c5e40df1de8e0f5052.tar.bz2 gentoo-b3ce8bbed78b0651008ec4c5e40df1de8e0f5052.zip | |
app-emulation/qemu: drop upstreamed patch
This reverts commit 3752d632441c34385ee7296126e3867536cb63e7.
Bug: https://bugs.gentoo.org/740836
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/files/qemu-9999-format-error.patch | 14 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 1 |
2 files changed, 0 insertions, 15 deletions
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=" |