Control: tag -1 + patch Hi again,
Axel Beckert wrote: > Adrian Bunk wrote: > > mssh-terminal.c: In function 'mssh_terminal_start_session': > > mssh-terminal.c:70:5: error: 'vte_terminal_spawn_sync' is deprecated > > [-Werror=deprecated-declarations] > > vte_terminal_spawn_sync(VTE_TERMINAL(terminal), > > ^~~~~~~~~~~~~~~~~~~~~~~ > > compilation terminated due to -Wfatal-errors. > > cc1: all warnings being treated as errors > > Makefile:378: recipe for target 'mssh-terminal.o' failed > > make[3]: *** [mssh-terminal.o] Error 1 > > According to > https://developer.gnome.org/vte/0.50/VteTerminal.html#vte-terminal-spawn-sync > vte_terminal_spawn_sync() has been replaced by > vte_terminal_spawn_async() which seems to work differently, i.e. it > need more than just a simple replacement. This is not completely true. All changed parameters either accept a default integer value or NULL. So forget my previous patch, this is the one to use: diff -Nru mssh-2.2/debian/changelog mssh-2.2/debian/changelog --- mssh-2.2/debian/changelog 2017-03-31 09:39:59.000000000 +0200 +++ mssh-2.2/debian/changelog 2017-10-02 14:53:23.000000000 +0200 @@ -1,3 +1,12 @@ +mssh (2.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS due to deprecated functions by replacing the call to + vte_terminal_spawn_sync() with a call to + vte_terminal_spawn_async(). (Closes: #876685) + + -- Axel Beckert <a...@debian.org> Mon, 02 Oct 2017 14:53:23 +0200 + mssh (2.2-2) unstable; urgency=medium * Add patch from Adrian Bunk to fix installation error. diff -Nru mssh-2.2/debian/patches/fix-ftbfs-with-libvte-0.50.patch mssh-2.2/debian/patches/fix-ftbfs-with-libvte-0.50.patch --- mssh-2.2/debian/patches/fix-ftbfs-with-libvte-0.50.patch 1970-01-01 01:00:00.000000000 +0100 +++ mssh-2.2/debian/patches/fix-ftbfs-with-libvte-0.50.patch 2017-10-02 14:53:23.000000000 +0200 @@ -0,0 +1,27 @@ +Description: Fix FTBFS with libvte 0.50 due to deprecated functions +Bug-Debian: https://bugs.debian.org/876685 +Author: Axel Beckert <a...@debian.org> + +--- a/src/mssh-terminal.c ++++ b/src/mssh-terminal.c +@@ -67,7 +67,7 @@ + args[4] = NULL; + } + +- vte_terminal_spawn_sync(VTE_TERMINAL(terminal), ++ vte_terminal_spawn_async(VTE_TERMINAL(terminal), + VTE_PTY_NO_LASTLOG|VTE_PTY_NO_UTMP|VTE_PTY_NO_WTMP, + NULL, /* working dir */ + args, +@@ -76,8 +76,10 @@ + NULL, /* child_setup */ + NULL, /* child_setup_data */ + NULL, /* *child_pid */ ++ -1, /* timeout */ + NULL, /* *cancellable */ +- NULL); /* Error handling */ ++ NULL, /* callback */ ++ NULL); /* user_data */ + + free(args[0]); + } diff -Nru mssh-2.2/debian/patches/series mssh-2.2/debian/patches/series --- mssh-2.2/debian/patches/series 2017-03-31 09:31:11.000000000 +0200 +++ mssh-2.2/debian/patches/series 2017-10-02 14:53:23.000000000 +0200 @@ -1,2 +1,3 @@ disable-pedantic-errors.patch intltools_update +fix-ftbfs-with-libvte-0.50.patch A first test also revealed that this patch has no impact on at least basic functionality. I'll upload this as NMU to DELAYED/5. Feel free to tell me if I should fast-forward it or delay it a little bit longer. Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
signature.asc
Description: Digital signature
