[Xen-changelog] [qemu-xen stable-4.12] gtk: Don't vte_terminal_set_encoding() on new VTE versions

[patchbot@xxxxxxx]

commit c0075e6e841327c1eef6fbdb603162d8cdd3815e
Author:     Kevin Wolf <kwolf@xxxxxxxxxx>
AuthorDate: Thu Oct 11 17:30:39 2018 +0200
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Tue Apr 2 17:29:08 2019 +0100

    gtk: Don't vte_terminal_set_encoding() on new VTE versions
    
    The function vte_terminal_set_encoding() is deprecated since VTE 0.54,
    so stop calling it from that version on. This fixes a build error
    because of our use of warning flags [-Werror=deprecated-declarations].
    
    Fixes: https://bugs.launchpad.net/bugs/1794939
    Reported-by: Bastian Koppelmann <kbastian@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Kevin Wolf <kwolf@xxxxxxxxxx>
    Message-id: 20181011153039.2324-1-kwolf@xxxxxxxxxx
    Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
    (cherry picked from commit 6415994ffcc6d22b3f5add67f63fe77e4b9711f4)
---
 ui/gtk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 5cce6ed42d..869b07eddc 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1951,13 +1951,15 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, 
VirtualConsole *vc,
     g_signal_connect(vc->vte.terminal, "commit", G_CALLBACK(gd_vc_in), vc);
 
     /* The documentation says that the default is UTF-8, but actually it is
-     * 7-bit ASCII at least in VTE 0.38.
-     */
+     * 7-bit ASCII at least in VTE 0.38. The function is deprecated since
+     * VTE 0.54 (only UTF-8 is supported now). */
+#if !VTE_CHECK_VERSION(0, 54, 0)
 #if VTE_CHECK_VERSION(0, 38, 0)
     vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL);
 #else
     vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8");
 #endif
+#endif
 
     vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte.terminal), -1);
     vte_terminal_set_size(VTE_TERMINAL(vc->vte.terminal),
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.12

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog