meson: don't require CONFIG_VTE for the GTK UI

[PATCH] meson: don't require CONFIG_VTE for the GTK UI

Mark Cave-Ayland posted 1 patch 3 years, 8 months ago

Download mbox

Test docker-quick@centos7 failed

Test docker-mingw@fedora failed

Test checkpatch failed

Test FreeBSD failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200825222310.27176-1-mark.cave-ayland@ilande.co.uk

Maintainers: Gerd Hoffmann <kraxel@redhat.com>

ui/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] meson: don't require CONFIG_VTE for the GTK UI

Posted by Mark Cave-Ayland 3 years, 8 months ago

Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as not
all platforms have VTE available (in particular Windows).

Remove this requirement from the meson build system to enable QEMU to be built
with GTK UI support for Windows once again.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 ui/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/meson.build b/ui/meson.build
index 018c5698bf..a81d5c259c 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -42,7 +42,7 @@ if config_host.has_key('CONFIG_CURSES')
   ui_modules += {'curses' : curses_ss}
 endif
 
-if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE')
+if config_host.has_key('CONFIG_GTK')
   softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
 
   gtk_ss = ss.source_set()
-- 
2.20.1

Re: [PATCH] meson: don't require CONFIG_VTE for the GTK UI

Posted by Gerd Hoffmann 3 years, 8 months ago

On Tue, Aug 25, 2020 at 11:23:10PM +0100, Mark Cave-Ayland wrote:
> Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as not
> all platforms have VTE available (in particular Windows).
> 
> Remove this requirement from the meson build system to enable QEMU to be built
> with GTK UI support for Windows once again.

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

Re: [PATCH] meson: don't require CONFIG_VTE for the GTK UI

Posted by Paolo Bonzini 3 years, 8 months ago

Queued, thanks.

Paolo

On Wed, Aug 26, 2020 at 12:23 AM Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
>
> Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as not
> all platforms have VTE available (in particular Windows).
>
> Remove this requirement from the meson build system to enable QEMU to be built
> with GTK UI support for Windows once again.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>  ui/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ui/meson.build b/ui/meson.build
> index 018c5698bf..a81d5c259c 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -42,7 +42,7 @@ if config_host.has_key('CONFIG_CURSES')
>    ui_modules += {'curses' : curses_ss}
>  endif
>
> -if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE')
> +if config_host.has_key('CONFIG_GTK')
>    softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
>
>    gtk_ss = ss.source_set()
> --
> 2.20.1
>