diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-vcs/giggle/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-vcs/giggle/files')
-rw-r--r-- | dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch | 24 | ||||
-rw-r--r-- | dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch | 57 |
2 files changed, 81 insertions, 0 deletions
diff --git a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch new file mode 100644 index 000000000000..37648e171232 --- /dev/null +++ b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch @@ -0,0 +1,24 @@ +diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h +index de5fe02..9ef33b5 100644 +--- a/src/giggle-diff-view.h ++++ b/src/giggle-diff-view.h +@@ -23,6 +23,7 @@ + + #include <glib-object.h> + #include <gtk/gtk.h> ++#include <gtksourceview/gtksourcebuffer.h> + #include <gtksourceview/gtksourceview.h> + #include <gtksourceview/gtksourcelanguagemanager.h> + +diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c +index 7746225..7b74c0a 100644 +--- a/src/giggle-view-file.c ++++ b/src/giggle-view-file.c +@@ -42,6 +42,7 @@ + + #include <gtksourceview/gtksourcelanguagemanager.h> + #include <gtksourceview/gtksourceview.h> ++#include <gtksourceview/gtksourcebuffer.h> + + #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT (giggle_view_file_snapshot_get_type ()) + #define GIGGLE_VIEW_FILE_SNAPSHOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot)) diff --git a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch new file mode 100644 index 000000000000..f800a9d157ca --- /dev/null +++ b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch @@ -0,0 +1,57 @@ +From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Mon, 26 Jan 2015 15:38:24 +0100 +Subject: [PATCH] Port to vte-2.91 API + +https://bugzilla.gnome.org/show_bug.cgi?id=743537 +--- + configure.ac | 2 +- + plugins/giggle-view-terminal.c | 19 ++++++++++--------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6e27733..72e7bd1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal], + AS_IF([test "x$enable_terminal" = "xyes"], + [ + PKG_CHECK_MODULES([VTE], +- [vte-2.90 >= $VTE_REQUIRED_VERSION], ++ [vte-2.91 >= $VTE_REQUIRED_VERSION], + [have_vte=yes + AC_DEFINE([HAVE_VTE], [1], + [Use features from vte]) +diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c +index 06a9a50..cd107f2 100644 +--- a/plugins/giggle-view-terminal.c ++++ b/plugins/giggle-view-terminal.c +@@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view, + real_argv[1] = NULL; + spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO; + +- succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal), +- pty_flags, +- directory, +- real_argv, +- NULL, +- spawn_flags, +- NULL, NULL, +- NULL, +- &error); ++ succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal), ++ pty_flags, ++ directory, ++ real_argv, ++ NULL, ++ spawn_flags, ++ NULL, NULL, ++ NULL, ++ NULL, ++ &error); + g_strfreev (real_argv); + + if (succes == FALSE) { +-- +2.1.0 + |