vte-0.46.1 - bump from gentoo + vte-ng patches

3 files changed, 383 insertions, 0 deletions

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 5e65ea0..0724351 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -4,3 +4,4 @@ DIST vte-0.36.4.tar.xz 1012848 SHA256 aa549b114c80e18791b57031e5c1714aeb4a104405
 DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
 DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db
 DIST vte-0.44.2.tar.xz 974596 SHA256 a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949 SHA512 98db3c1528d5f458164e2d30056cd816e5943d9c569551878119e79d4fbca1865e52667393bf298f32fd54710d1b268a5aac125222ecb29ce854522be3776356 WHIRLPOOL 62830dc20a3aa29f4c13b3370d960f5522bb42231b68f426b2b662a40c4c8265f9d8a76c4e598cdfd5c8d8c5f712d3d9828f5f2ed5e24182f9be8697debe2ca6
+DIST vte-0.46.1.tar.xz 989164 SHA256 8800cf8bc259704a12ad1853fb0eb43bfe3857af15242e6fb9f2c3fd95b3f5c6 SHA512 04b3f8ce922c4326d92bef605a0dbe195764946cd5f1acf28fd6d69c0cdb2ee661cc7e424436c72380da5d0250790ae658ac49d761b567dea88d92157285889d WHIRLPOOL 7947982c2e9eba1481f302da8bf3433156490537c9e7ab1ef8da8d399b3dccec0911253b8973712be77fa89f7eb9451e09b65ffd6cc2ccc6e2bea9fb9f2997f8
diff --git a/x11-libs/vte/files/vte-ng-0.46.0.patch b/x11-libs/vte/files/vte-ng-0.46.0.patch
new file mode 100644
index 0000000..01c891e
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.46.0.patch
@@ -0,0 +1,301 @@
+-------------------------------------------------------------------------------
+expose-functions-for-pausing
+-------------------------------------------------------------------------------
+expose functions for pausing unpausing output
+
+From: Jelle van der Waa <jelle@vdwaa.nl>
+
+
+---
+ src/vte/vteterminal.h |    6 ++++++
+ src/vtegtk.cc         |   26 ++++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 7836271..7b0f2dc 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -168,6 +168,12 @@ void vte_terminal_feed_child_binary(VteTerminal *terminal,
+                                     const guint8 *data,
+                                     gsize length) _VTE_GNUC_NONNULL(1);
+ 
++_VTE_PUBLIC
++void vte_terminal_connect_pty_read(VteTerminal *terminal);
++
++_VTE_PUBLIC
++void vte_terminal_disconnect_pty_read(VteTerminal *terminal);
++
+ /* Copy currently-selected text to the clipboard, or from the clipboard to
+  * the terminal. */
+ _VTE_PUBLIC
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index 924b5a0..442e20c 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2325,6 +2325,32 @@ vte_terminal_feed_child(VteTerminal *terminal,
+ }
+ 
+ /**
++ * vte_terminal_connect_pty_read:
++ * @terminal: a #VteTerminal
++ *
++ * Unpause output
++ */
++void
++vte_terminal_connect_pty_read(VteTerminal *terminal)
++{
++	g_return_if_fail(VTE_IS_TERMINAL(terminal));
++	IMPL(terminal)->connect_pty_read();
++}
++
++/**
++ * vte_terminal_disconnect_pty_read:
++ * @terminal: a #VteTerminal
++ *
++ * Pause output
++ */
++void
++vte_terminal_disconnect_pty_read(VteTerminal *terminal)
++{
++	g_return_if_fail(VTE_IS_TERMINAL(terminal));
++	IMPL(terminal)->disconnect_pty_read();
++}
++
++/**
+  * vte_terminal_feed_child_binary:
+  * @terminal: a #VteTerminal
+  * @data: (array length=length) (element-type guint8) (allow-none): data to send to the child
+-------------------------------------------------------------------------------
+expose-function-for-setting
+-------------------------------------------------------------------------------
+expose function for setting cursor position
+
+From: Jelle van der Waa <jelle@vdwaa.nl>
+
+
+---
+ src/vte/vteterminal.h |    5 +++++
+ src/vtegtk.cc         |   24 ++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 7b0f2dc..03e963d 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -340,6 +340,11 @@ _VTE_PUBLIC
+ void vte_terminal_get_cursor_position(VteTerminal *terminal,
+ 				      glong *column,
+                                       glong *row) _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
++void vte_terminal_set_cursor_position(VteTerminal *terminal,
++                                      glong column,
++                                      glong row) _VTE_GNUC_NONNULL(1);
++
+ 
+ /* Add a matching expression, returning the tag the widget assigns to that
+  * expression. */
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index 442e20c..f9c196b 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2160,6 +2160,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal,
+ }
+ 
+ /**
++ * vte_terminal_set_cursor_position
++ * @terminal: a #VteTerminal
++ * @column: the new cursor column
++ * @row: the new cursor row
++ *
++ * Set the location of the cursor.
++ */
++void
++vte_terminal_set_cursor_position(VteTerminal *terminal,
++		                 long column, long row)
++{
++	g_return_if_fail(VTE_IS_TERMINAL(terminal));
++
++        auto impl = IMPL(terminal);
++	impl->invalidate_cursor_once(FALSE);
++	impl->m_screen->cursor.col = column;
++	impl->m_screen->cursor.row = row;
++	impl->invalidate_cursor_once(FALSE);
++	impl->check_cursor_blink();
++	impl->queue_cursor_moved();
++
++}
++
++/**
+  * vte_terminal_pty_new_sync:
+  * @terminal: a #VteTerminal
+  * @flags: flags from #VtePtyFlags
+-------------------------------------------------------------------------------
+add-function-for-setting-the
+-------------------------------------------------------------------------------
+add function for setting the text selections
+
+From: Jelle van der Waa <jelle@vdwaa.nl>
+
+
+---
+ src/vte/vteterminal.h |    4 ++++
+ src/vtegtk.cc         |   20 ++++++++++++++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 03e963d..36a7970 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -188,6 +188,10 @@ _VTE_PUBLIC
+ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ _VTE_PUBLIC
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
++			      long end_col, long end_row) _VTE_GNUC_NONNULL(1);
++
+ 
+ /* By-word selection */
+ _VTE_PUBLIC
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index f9c196b..e94d7e3 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2135,6 +2135,26 @@ vte_terminal_unselect_all(VteTerminal *terminal)
+ }
+ 
+ /**
++ * vte_terminal_select_text:
++ * @terminal: a #VteTerminal
++ * @start_col: the starting column for the selection
++ * @start_row: the starting row for the selection
++ * @end_col: the end column for the selection
++ * @end_row: the end row for the selection
++ *
++ * Sets the current selection region.
++ */
++void
++vte_terminal_select_text(VteTerminal *terminal,
++		         long start_col, long start_row,
++			 long end_col, long end_row)
++{
++	g_return_if_fail (VTE_IS_TERMINAL (terminal));
++
++        IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
++}
++
++/**
+  * vte_terminal_get_cursor_position:
+  * @terminal: a #VteTerminal
+  * @column: (out) (allow-none): a location to store the column, or %NULL
+-------------------------------------------------------------------------------
+add-functions-to-get-set-block
+-------------------------------------------------------------------------------
+add functions to get/set block selection mode
+
+From: Jelle van der Waa <jelle@vdwaa.nl>
+
+
+---
+ src/vte/vteterminal.h |    5 +++++
+ src/vtegtk.cc         |   25 +++++++++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 36a7970..8d37879 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -189,6 +189,11 @@ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ _VTE_PUBLIC
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ _VTE_PUBLIC
++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
++void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
++                                            gboolean block_mode) _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
+ void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
+ 			      long end_col, long end_row) _VTE_GNUC_NONNULL(1);
+ 
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index e94d7e3..e074802 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2133,6 +2133,31 @@ vte_terminal_unselect_all(VteTerminal *terminal)
+ 
+         IMPL(terminal)->deselect_all();
+ }
++/**
++ * vte_terminal_get_selection_block_mode:
++ * @terminal: a #VteTerminal
++ *
++ * Checks whether or not block selection is enabled.
++ *
++ * Returns: %TRUE if block selection is enabled, %FALSE if not
++ */
++
++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
++        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
++	return IMPL(terminal)->m_selection_block_mode;
++}
++/**
++ * vte_terminal_set_selection_block_mode:
++ * @terminal: a #VteTerminal
++ * @block_mode: whether block selection is enabled
++ *
++ * Sets whether or not block selection is enabled.
++ */
++void
++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
++	g_return_if_fail (VTE_IS_TERMINAL (terminal));
++	IMPL(terminal)->m_selection_block_mode = block_mode;
++}
+ 
+ /**
+  * vte_terminal_select_text:
+-------------------------------------------------------------------------------
+expose-function-for-getting
+-------------------------------------------------------------------------------
+expose function for getting the selected text
+
+From: Jelle van der Waa <jelle@vdwaa.nl>
+
+
+---
+ src/vte/vteterminal.h |    4 +++-
+ src/vtegtk.cc         |    7 +++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 8d37879..1f3095f 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -196,7 +196,9 @@ void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
+ _VTE_PUBLIC
+ void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
+ 			      long end_col, long end_row) _VTE_GNUC_NONNULL(1);
+-
++_VTE_PUBLIC
++char *
++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ 
+ /* By-word selection */
+ _VTE_PUBLIC
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index e074802..2c19dde 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2179,6 +2179,13 @@ vte_terminal_select_text(VteTerminal *terminal,
+         IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
+ }
+ 
++char *
++vte_terminal_get_selection(VteTerminal *terminal)
++{
++	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
++	return g_strdup (IMPL(terminal)->m_selection_text[VTE_SELECTION_PRIMARY]);
++}
++
+ /**
+  * vte_terminal_get_cursor_position:
+  * @terminal: a #VteTerminal
diff --git a/x11-libs/vte/vte-0.46.1.ebuild b/x11-libs/vte/vte-0.46.1.ebuild
new file mode 100644
index 0000000..d3e79f4
--- /dev/null
+++ b/x11-libs/vte/vte-0.46.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE termite-patch? ( https://github.com/thestinger/vte-ng )"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection termite-patch vala"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	use termite-patch && eapply "$FILESDIR"/vte-ng-0.46.0.patch
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}