diff options
Diffstat (limited to 'x11-libs/vte/files')
| -rw-r--r-- | x11-libs/vte/files/0.54.4-vala-0.44-compat.patch | 29 | ||||
| -rw-r--r-- | x11-libs/vte/files/vte-0.56.2-ds-mc.diff | 82 |
2 files changed, 111 insertions, 0 deletions
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch new file mode 100644 index 0000000..5da32be --- /dev/null +++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch @@ -0,0 +1,29 @@ +From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 1 Dec 2018 19:04:59 +0100 +Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty + struct definition + +This should get a proper refactoring as the FIXME suggests. + +See https://gitlab.gnome.org/GNOME/vte/issues/76 +--- + bindings/vala/app.vala | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala +index 8663d63c..a534e76b 100644 +--- a/bindings/vala/app.vala ++++ b/bindings/vala/app.vala +@@ -819,6 +819,8 @@ class App : Gtk.Application + + public struct Options + { ++ //FIXME Merge this struct into App class ++ public int dummy; + public static bool audible = false; + public static string? command = null; + private static string? cjk_ambiguous_width_string = null; +-- +2.20.1 + diff --git a/x11-libs/vte/files/vte-0.56.2-ds-mc.diff b/x11-libs/vte/files/vte-0.56.2-ds-mc.diff new file mode 100644 index 0000000..cfa411e --- /dev/null +++ b/x11-libs/vte/files/vte-0.56.2-ds-mc.diff @@ -0,0 +1,82 @@ +Description: DarkSoft mc patches + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vte2.91 (0.56.2-1ubuntu1~19.04.1) disco; urgency=medium + . + * Backport bugfix release to disco (LP: #1827207) +Author: Iain Lane <iain.lane@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1827207 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: https://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: 2019-07-07 + +--- vte2.91-0.56.2.orig/ChangeLog ++++ vte2.91-0.56.2/ChangeLog +@@ -1,3 +1,9 @@ ++Author: Suren A. Chilingaryan <csa@suren.me> ++Date: Sun Jul 7 11:16:00 2019 +0200 ++ ++ mc integration ++ ++ + commit 9a079492ea698f573dfc7129f1c79e4a865803b4 + Author: Christian Persch <chpe@src.gnome.org> + Date: Sat Apr 20 19:41:46 2019 +0200 +--- vte2.91-0.56.2.orig/src/vte.cc ++++ vte2.91-0.56.2/src/vte.cc +@@ -4763,7 +4763,9 @@ Terminal::widget_key_press(GdkEventKey * + break; + case GDK_KEY_KP_Insert: + case GDK_KEY_Insert: +- if (m_modifiers & GDK_SHIFT_MASK) { ++ //printf("%lx %s\n", modifiers, terminal->window_title); ++ if (strncmp(vte_terminal_get_window_title(m_terminal), "mc", 2)) { ++ if (m_modifiers & GDK_SHIFT_MASK) { + if (m_modifiers & GDK_CONTROL_MASK) { + emit_paste_clipboard(); + handled = TRUE; +@@ -4773,11 +4775,29 @@ Terminal::widget_key_press(GdkEventKey * + handled = TRUE; + suppress_meta_esc = TRUE; + } +- } else if (m_modifiers & GDK_CONTROL_MASK) { ++ } else if (m_modifiers & GDK_CONTROL_MASK) { + emit_copy_clipboard(); + handled = TRUE; + suppress_meta_esc = TRUE; ++ } + } ++ ++ if ((m_modifiers & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { ++ widget_paste(GDK_SELECTION_PRIMARY); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } else if (m_modifiers & (GDK_MOD1_MASK|GDK_META_MASK|0x2000)) { ++ if (m_modifiers & GDK_CONTROL_MASK) { ++ emit_copy_clipboard(); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } else if (m_modifiers & GDK_SHIFT_MASK) { ++ widget_paste(GDK_SELECTION_PRIMARY); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } ++ } ++ + break; + /* Keypad/motion keys. */ + case GDK_KEY_KP_Up: |