summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2023-05-05 11:19:24 -0500
committerMatthias Maier <tamiko@gentoo.org>2023-05-05 13:11:17 -0500
commitbe4c0fdfda7a00698701d61467154dba7009e38e (patch)
tree860d515baaf4669b8148078c5a4ef1f6db38d4c3 /app-emulation/qemu/files
parentapp-emulation/qemu: add 7.2.1 (diff)
downloadgentoo-be4c0fdfda7a00698701d61467154dba7009e38e.tar.gz
gentoo-be4c0fdfda7a00698701d61467154dba7009e38e.tar.bz2
gentoo-be4c0fdfda7a00698701d61467154dba7009e38e.zip
app-emulation/qemu: add 8.0.0
- merge qemu-7.2.1 and qemu-9999 ebuilds - remove static keyword - update to --enable-trace-backends configuration option Bug: https://bugs.gentoo.org/905342 Bug: https://bugs.gentoo.org/865121 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/qemu/files')
-rw-r--r--app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch18
-rw-r--r--app-emulation/qemu/files/qemu-8.0.0-make.patch9
2 files changed, 15 insertions, 12 deletions
diff --git a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
index aab5dde5fbd9..6a5437056e6f 100644
--- a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
+++ b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
@@ -1,7 +1,8 @@
-diff -ruN qemu-9999.orig/meson.build qemu-9999/meson.build
---- qemu-9999.orig/meson.build 2023-03-12 01:17:38.273756012 +0100
-+++ qemu-9999/meson.build 2023-03-12 01:18:44.854716789 +0100
-@@ -667,6 +667,8 @@
+diff --git a/meson.build b/meson.build
+index c44d05a13..5c5c09894 100644
+--- a/meson.build
++++ b/meson.build
+@@ -671,6 +671,8 @@ endif
if get_option('xkbcommon').auto() and not have_system and not have_tools
xkbcommon = not_found
@@ -10,10 +11,11 @@ diff -ruN qemu-9999.orig/meson.build qemu-9999/meson.build
else
xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
method: 'pkg-config', kwargs: static_kwargs)
-diff -ruN qemu-9999.orig/pc-bios/keymaps/meson.build qemu-9999/pc-bios/keymaps/meson.build
---- qemu-9999.orig/pc-bios/keymaps/meson.build 2023-03-12 01:17:38.321756706 +0100
-+++ qemu-9999/pc-bios/keymaps/meson.build 2023-03-12 01:20:22.015111600 +0100
-@@ -33,8 +33,10 @@
+diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
+index 158a3b410..3bb318a23 100644
+--- a/pc-bios/keymaps/meson.build
++++ b/pc-bios/keymaps/meson.build
+@@ -33,8 +33,10 @@ keymaps = {
'tr': '-l tr',
}
diff --git a/app-emulation/qemu/files/qemu-8.0.0-make.patch b/app-emulation/qemu/files/qemu-8.0.0-make.patch
index 4bf3f7157713..40bafd490052 100644
--- a/app-emulation/qemu/files/qemu-8.0.0-make.patch
+++ b/app-emulation/qemu/files/qemu-8.0.0-make.patch
@@ -1,7 +1,8 @@
-diff -ruN qemu-9999.orig/configure qemu-9999/configure
---- qemu-9999.orig/configure 2023-03-12 01:26:15.488133462 +0100
-+++ qemu-9999/configure 2023-03-12 01:29:19.355724020 +0100
-@@ -1068,7 +1068,7 @@
+diff --git a/configure b/configure
+index 800b5850f..331e8950d 100755
+--- a/configure
++++ b/configure
+@@ -1069,7 +1069,7 @@ then
fi
fi