Package: mssh
Followup-For: Bug #788017
This issue could be fixed by applying these two patches.
The first one is to port mssh to vte-2.91 api.
The second replaces autotools-dev by autoreconf (as configure.ac has changed,
we need to regenerate configure).
Regards,
Rodolphe
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 5a09b444471c5400a9d20e25a57ddbd96857ee71 Mon Sep 17 00:00:00 2001
From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net>
Date: Mon, 8 Jun 2015 11:08:00 +0200
Subject: [PATCH] Port to vte-2.91 API
---
debian/control | 2 +-
debian/patches/0003-Port-to-vte-2.91-API.patch | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 134 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0003-Port-to-vte-2.91-API.patch
diff --git a/debian/control b/debian/control
index 62b4380..06dac65 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: autotools-dev,
debhelper (>= 9~),
libgconf2-dev,
libgtk-3-dev,
- libvte-2.90-dev
+ libvte-2.91-dev
Standards-Version: 3.9.5
Homepage: http://baloo.dyndns.biz
Vcs-Git: git://baloo.dyndns.biz/mssh.git -b gtk2
diff --git a/debian/patches/0003-Port-to-vte-2.91-API.patch b/debian/patches/0003-Port-to-vte-2.91-API.patch
new file mode 100644
index 0000000..e17b9f1
--- /dev/null
+++ b/debian/patches/0003-Port-to-vte-2.91-API.patch
@@ -0,0 +1,132 @@
+From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net>
+Date: Mon, 8 Jun 2015 11:05:36 +0200
+Subject: Port to vte-2.91 API.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788017
+---
+ configure.ac | 2 +-
+ src/mssh-gconf.c | 17 +++++++++--------
+ src/mssh-terminal.c | 25 +++++++++++++------------
+ 3 files changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ae384b..61e40aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE
+
+ AC_PROG_CC
+
+-PKG_CHECK_MODULES(MSSH, [gtk+-3.0 vte-2.90 gconf-2.0])
++PKG_CHECK_MODULES(MSSH, [gtk+-3.0 vte-2.91 gconf-2.0])
+ AC_SUBST(MSSH_CFLAGS)
+ AC_SUBST(MSSH_LIBS)
+
+diff --git a/src/mssh-gconf.c b/src/mssh-gconf.c
+index f521754..7d9dc4d 100644
+--- a/src/mssh-gconf.c
++++ b/src/mssh-gconf.c
+@@ -9,19 +9,20 @@ void mssh_gconf_notify_font(GConfClient *client, guint cnxn_id,
+ GConfEntry *entry, gpointer data)
+ {
+ GConfValue *value;
+- const gchar *font;
++ PangoFontDescription *font_desc;
+ int i;
+
+ MSSHWindow *window = MSSH_WINDOW(data);
+
+ value = gconf_entry_get_value(entry);
+- font = gconf_value_get_string(value);
++ font_desc = pango_font_description_from_string(gconf_value_get_string(value));
+
+ for(i = 0; i < window->terminals->len; i++)
+ {
+- vte_terminal_set_font_from_string(VTE_TERMINAL(g_array_index(
+- window->terminals, MSSHTerminal*, i)), font);
++ vte_terminal_set_font(VTE_TERMINAL(g_array_index(
++ window->terminals, MSSHTerminal*, i)), font_desc);
+ }
++ pango_font_description_free(font_desc);
+ }
+
+ void mssh_gconf_notify_fg_colour(GConfClient *client, guint cnxn_id,
+@@ -40,7 +41,7 @@ void mssh_gconf_notify_fg_colour(GConfClient *client, guint cnxn_id,
+
+ for(i = 0; i < window->terminals->len; i++)
+ {
+- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(g_array_index(
++ vte_terminal_set_color_foreground(VTE_TERMINAL(g_array_index(
+ window->terminals, MSSHTerminal*, i)), &colour);
+ }
+ }
+@@ -61,7 +62,7 @@ void mssh_gconf_notify_bg_colour(GConfClient *client, guint cnxn_id,
+
+ for(i = 0; i < window->terminals->len; i++)
+ {
+- vte_terminal_set_color_background_rgba(VTE_TERMINAL(g_array_index(
++ vte_terminal_set_color_background(VTE_TERMINAL(g_array_index(
+ window->terminals, MSSHTerminal*, i)), &colour);
+ }
+ }
+@@ -98,7 +99,7 @@ void mssh_gconf_notify_fg_colour_focus(GConfClient *client, guint cnxn_id,
+
+ if (idx != -1) {
+ /* found the currently focused terminal, update the color */
+- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(g_array_index(
++ vte_terminal_set_color_foreground(VTE_TERMINAL(g_array_index(
+ window->terminals, MSSHTerminal*, idx)), &colour);
+ }
+ }
+@@ -135,7 +136,7 @@ void mssh_gconf_notify_bg_colour_focus(GConfClient *client, guint cnxn_id,
+
+ if (idx != -1) {
+ /* found the currently focused terminal, update the color */
+- vte_terminal_set_color_background_rgba(VTE_TERMINAL(g_array_index(
++ vte_terminal_set_color_background(VTE_TERMINAL(g_array_index(
+ window->terminals, MSSHTerminal*, idx)), &colour);
+ }
+
+diff --git a/src/mssh-terminal.c b/src/mssh-terminal.c
+index 1f17c7c..671194d 100644
+--- a/src/mssh-terminal.c
++++ b/src/mssh-terminal.c
+@@ -67,16 +67,17 @@ void mssh_terminal_start_session(MSSHTerminal *terminal, char **env)
+ args[4] = NULL;
+ }
+
+- vte_terminal_fork_command_full(VTE_TERMINAL(terminal),
+- VTE_PTY_NO_LASTLOG|VTE_PTY_NO_UTMP|VTE_PTY_NO_WTMP,
+- NULL, /* working dir */
+- args,
+- env,
+- G_SPAWN_SEARCH_PATH,
+- NULL, /* child_setup */
+- NULL, /* child_setup_data */
+- NULL, /* *child_pid */
+- NULL); /* Error handling */
++ vte_terminal_spawn_sync(VTE_TERMINAL(terminal),
++ VTE_PTY_NO_LASTLOG|VTE_PTY_NO_UTMP|VTE_PTY_NO_WTMP,
++ NULL, /* working dir */
++ args,
++ env,
++ G_SPAWN_SEARCH_PATH,
++ NULL, /* child_setup */
++ NULL, /* child_setup_data */
++ NULL, /* *child_pid */
++ NULL, /* cancellable */
++ NULL); /* Error handling */
+
+ free(args[0]);
+ }
+@@ -114,8 +115,8 @@ static void mssh_terminal_init(MSSHTerminal* terminal)
+ terminal->started = 0;
+ terminal->ended = 0;
+
+- vte_terminal_set_word_chars(VTE_TERMINAL(terminal),
+- "-A-Za-z0-9,./?%&#:_=+@~");
++ vte_terminal_set_word_char_exceptions(VTE_TERMINAL(terminal),
++ "-,./?%&#:_=+@~");
+
+ g_signal_connect(G_OBJECT(terminal), "child-exited",
+ G_CALLBACK(mssh_terminal_child_exited), terminal);
diff --git a/debian/patches/series b/debian/patches/series
index 30829b8..e8cf5e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
remove_deprecated_gtk_widget_set_margin_left
remove_deprecated_gtk_image_menu_item_new_from_stock
+0003-Port-to-vte-2.91-API.patch
--
libgit2 0.22.2
>From 8d853950065c160df14a0505360187b333f9b92c Mon Sep 17 00:00:00 2001
From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net>
Date: Mon, 8 Jun 2015 11:43:36 +0200
Subject: [PATCH] Use autoreconf instead of autotools-dev.
---
debian/control | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 06dac65..fc5366d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mssh
Section: admin
Priority: optional
Maintainer: Hector Garcia <hec...@debian.org>
-Build-Depends: autotools-dev,
+Build-Depends: dh-autoreconf,
bash-completion,
debhelper (>= 9~),
libgconf2-dev,
diff --git a/debian/rules b/debian/rules
index 9a8ddf6..ed64f79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
LDFLAGS+=-Wl,--as-needed
%:
- dh $@ --with autotools-dev
+ dh $@ --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
--
libgit2 0.22.2
