From afa5d0e59ed9bf199267999ec7a7554baef19eef Mon Sep 17 00:00:00 2001 From: eroen Date: Sat, 7 May 2016 13:31:19 +0200 Subject: termite-11 - bump Requested by Tear :) --- x11-libs/vte/Manifest | 1 + .../01-expose-functions-for-pausing.patch | 108 +++++++++++++++++++++ .../02-expose-function-for-setting.patch | 56 +++++++++++ .../03-add-function-for-setting-the.patch | 53 ++++++++++ .../04-add-functions-to-get-set-block.patch | 61 ++++++++++++ .../05-expose-function-for-getting.patch | 63 ++++++++++++ x11-libs/vte/files/vte-ng-0.42.4/series | 6 ++ x11-libs/vte/vte-0.42.4.ebuild | 84 ++++++++++++++++ 8 files changed, 432 insertions(+) create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/01-expose-functions-for-pausing.patch create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/02-expose-function-for-setting.patch create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/03-add-function-for-setting-the.patch create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/04-add-functions-to-get-set-block.patch create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/05-expose-function-for-getting.patch create mode 100644 x11-libs/vte/files/vte-ng-0.42.4/series create mode 100644 x11-libs/vte/vte-0.42.4.ebuild (limited to 'x11-libs') diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index c5a50144..a7b9b1a9 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -4,3 +4,4 @@ DIST vte-0.36.2.tar.xz 1009160 SHA256 f45eed3aed823068c7563345ea947be0e6ddb3dacd DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca DIST vte-0.36.4.tar.xz 1012848 SHA256 aa549b114c80e18791b57031e5c1714aeb4a104405e3ba78dfd4ac374a71e2a1 SHA512 97bb226abaf2100a21856040039640005809eae647432c03a33eb691c8b0a29c13bd8cf824790c2a6360356c8c5d1b61c48b4a7893c7f0a8d3678b1a0914aa31 WHIRLPOOL d1294540c67e3253b166dc351b68534d9f36b1306449e2a319705cafe0317452e3bbe1768fdc30523f85270c2b949b9d9cf606695989968da4a099355413904c 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 diff --git a/x11-libs/vte/files/vte-ng-0.42.4/01-expose-functions-for-pausing.patch b/x11-libs/vte/files/vte-ng-0.42.4/01-expose-functions-for-pausing.patch new file mode 100644 index 00000000..b4cc9673 --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/01-expose-functions-for-pausing.patch @@ -0,0 +1,108 @@ +expose functions for pausing/unpausing output + +From: Daniel Micay + + +--- + src/vte.cc | 21 +++++++++++---------- + src/vte/vteterminal.h | 4 ++++ + 2 files changed, 15 insertions(+), 10 deletions(-) + +diff --git a/src/vte.cc b/src/vte.cc +index 701891b..af75d2d 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -127,7 +127,6 @@ static char *vte_terminal_get_text_maybe_wrapped(VteTerminal *terminal, + gpointer data, + GArray *attributes, + gboolean include_trailing_spaces); +-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); + static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); + static void vte_terminal_stop_processing (VteTerminal *terminal); + +@@ -3349,9 +3348,10 @@ static void mark_input_source_invalid(VteTerminal *terminal) + _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); + terminal->pvt->pty_input_source = 0; + } +-static void +-_vte_terminal_connect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_connect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_channel == NULL) { + return; + } +@@ -3403,9 +3403,10 @@ _vte_terminal_connect_pty_write(VteTerminal *terminal) + } + } + +-static void +-_vte_terminal_disconnect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_disconnect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_input_source != 0) { + _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); + g_source_remove(terminal->pvt->pty_input_source); +@@ -6705,7 +6706,7 @@ vte_terminal_start_selection(VteTerminal *terminal, long x, long y, + vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); + + /* Temporarily stop caring about input from the child. */ +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + } + + static gboolean +@@ -6722,7 +6723,7 @@ _vte_terminal_maybe_end_selection (VteTerminal *terminal) + terminal->pvt->selecting = FALSE; + + /* Reconnect to input from the child if we paused it. */ +- _vte_terminal_connect_pty_read(terminal); ++ vte_terminal_connect_pty_read(terminal); + + return TRUE; + } +@@ -8885,7 +8886,7 @@ vte_terminal_finalize(GObject *object) + #endif + kill(terminal->pvt->pty_pid, SIGHUP); + } +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + if (terminal->pvt->pty_channel != NULL) { + g_io_channel_unref (terminal->pvt->pty_channel); +@@ -12444,7 +12445,7 @@ vte_terminal_set_pty(VteTerminal *terminal, + g_object_freeze_notify(object); + + if (pvt->pty != NULL) { +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + + if (terminal->pvt->pty_channel != NULL) { +@@ -12498,7 +12499,7 @@ vte_terminal_set_pty(VteTerminal *terminal, + _vte_terminal_setup_utf8 (terminal); + + /* Open channels to listen for input on. */ +- _vte_terminal_connect_pty_read (terminal); ++ vte_terminal_connect_pty_read (terminal); + + g_object_notify(object, "pty"); + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index dbe3ffe..f9c95ed 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -176,6 +176,10 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + ++/* pause and unpause output */ ++void vte_terminal_disconnect_pty_read(VteTerminal *vte); ++void vte_terminal_connect_pty_read(VteTerminal *vte); ++ + /* By-word selection */ + void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, + const char *exceptions) _VTE_GNUC_NONNULL(1); diff --git a/x11-libs/vte/files/vte-ng-0.42.4/02-expose-function-for-setting.patch b/x11-libs/vte/files/vte-ng-0.42.4/02-expose-function-for-setting.patch new file mode 100644 index 00000000..df0a2f8f --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/02-expose-function-for-setting.patch @@ -0,0 +1,56 @@ +expose function for setting the cursor position + +From: Daniel Micay + + +--- + src/vte.cc | 22 ++++++++++++++++++++++ + src/vte/vteterminal.h | 2 ++ + 2 files changed, 24 insertions(+) + +diff --git a/src/vte.cc b/src/vte.cc +index af75d2d..5daa311 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -6529,6 +6529,28 @@ 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)); ++ ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ terminal->pvt->screen->cursor.col = column; ++ terminal->pvt->screen->cursor.row = row; ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ _vte_check_cursor_blink(terminal); ++ vte_terminal_queue_cursor_moved(terminal); ++} ++ + /* Place the selected text onto the clipboard. Do this asynchronously so that + * we get notified when the selection we placed on the clipboard is replaced. */ + static void +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index f9c95ed..4a03a96 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -290,6 +290,8 @@ char *vte_terminal_get_text_range(VteTerminal *terminal, + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) _VTE_GNUC_NONNULL(1); + + /* Add a matching expression, returning the tag the widget assigns to that + * expression. */ diff --git a/x11-libs/vte/files/vte-ng-0.42.4/03-add-function-for-setting-the.patch b/x11-libs/vte/files/vte-ng-0.42.4/03-add-function-for-setting-the.patch new file mode 100644 index 00000000..49029ee5 --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/03-add-function-for-setting-the.patch @@ -0,0 +1,53 @@ +add function for setting the text selection + +From: Daniel Micay + + +--- + src/vte.cc | 18 ++++++++++++++++++ + src/vte/vteterminal.h | 3 +++ + 2 files changed, 21 insertions(+) + +diff --git a/src/vte.cc b/src/vte.cc +index 5daa311..1c995bf 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -7245,6 +7245,24 @@ vte_terminal_unselect_all(VteTerminal *terminal) + vte_terminal_deselect_all (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) { ++ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); ++} ++ + /* Autoscroll a bit. */ + static gboolean + vte_terminal_autoscroll(VteTerminal *terminal) +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 4a03a96..08414df 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -175,6 +175,9 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); + + /* pause and unpause output */ + void vte_terminal_disconnect_pty_read(VteTerminal *vte); diff --git a/x11-libs/vte/files/vte-ng-0.42.4/04-add-functions-to-get-set-block.patch b/x11-libs/vte/files/vte-ng-0.42.4/04-add-functions-to-get-set-block.patch new file mode 100644 index 00000000..f9a562fb --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/04-add-functions-to-get-set-block.patch @@ -0,0 +1,61 @@ +add functions to get/set block selection mode + +From: Daniel Micay + + +--- + src/vte.cc | 26 ++++++++++++++++++++++++++ + src/vte/vteterminal.h | 3 +++ + 2 files changed, 29 insertions(+) + +diff --git a/src/vte.cc b/src/vte.cc +index 1c995bf..82e9891 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -7245,6 +7245,32 @@ vte_terminal_unselect_all(VteTerminal *terminal) + vte_terminal_deselect_all (terminal); + } + ++/** ++ * 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 terminal->pvt->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)); ++ terminal->pvt->selection_block_mode = block_mode; ++} + + /** + * vte_terminal_select_text: +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 08414df..3cb5c71 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -175,6 +175,9 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); + 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/x11-libs/vte/files/vte-ng-0.42.4/05-expose-function-for-getting.patch b/x11-libs/vte/files/vte-ng-0.42.4/05-expose-function-for-getting.patch new file mode 100644 index 00000000..60ca661b --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/05-expose-function-for-getting.patch @@ -0,0 +1,63 @@ +expose function for getting the selected text + +From: Daniel Micay + + +--- + src/vte.cc | 2 +- + src/vte/vteterminal.h | 2 ++ + src/vteaccess.cc | 2 +- + src/vteint.h | 1 - + 4 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/vte.cc b/src/vte.cc +index 82e9891..b431e5e 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -12598,7 +12598,7 @@ _vte_terminal_accessible_ref(VteTerminal *terminal) + } + + char * +-_vte_terminal_get_selection(VteTerminal *terminal) ++vte_terminal_get_selection(VteTerminal *terminal) + { + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 3cb5c71..72fc362 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -181,6 +181,8 @@ void vte_terminal_set_selection_block_mode(VteTerminal *terminal, + void vte_terminal_select_text(VteTerminal *terminal, + long start_col, long start_row, + long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + + /* pause and unpause output */ + void vte_terminal_disconnect_pty_read(VteTerminal *vte); +diff --git a/src/vteaccess.cc b/src/vteaccess.cc +index c5c6414..5c14bcb 100644 +--- a/src/vteaccess.cc ++++ b/src/vteaccess.cc +@@ -1441,7 +1441,7 @@ vte_terminal_accessible_get_selection(AtkText *text, gint selection_number, + *start_offset = offset_from_xy (priv, start_x, start_y); + _vte_terminal_get_end_selection (terminal, &end_x, &end_y); + *end_offset = offset_from_xy (priv, end_x, end_y); +- return _vte_terminal_get_selection (terminal); ++ return vte_terminal_get_selection (terminal); + } + + static gboolean +diff --git a/src/vteint.h b/src/vteint.h +index 7f57eb1..e0a3bec 100644 +--- a/src/vteint.h ++++ b/src/vteint.h +@@ -24,7 +24,6 @@ + G_BEGIN_DECLS + + void _vte_terminal_accessible_ref(VteTerminal *terminal); +-char* _vte_terminal_get_selection(VteTerminal *terminal); + void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); diff --git a/x11-libs/vte/files/vte-ng-0.42.4/series b/x11-libs/vte/files/vte-ng-0.42.4/series new file mode 100644 index 00000000..d0e724dd --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.42.4/series @@ -0,0 +1,6 @@ +# This series applies on GIT commit fff3b5f904d3b6d1deb9beec9ae871b135696966 +01-expose-functions-for-pausing.patch +02-expose-function-for-setting.patch +03-add-function-for-setting-the.patch +04-add-functions-to-get-set-block.patch +05-expose-function-for-getting.patch diff --git a/x11-libs/vte/vte-0.42.4.ebuild b/x11-libs/vte/vte-0.42.4.ebuild new file mode 100644 index 00000000..dc6d8b1e --- /dev/null +++ b/x11-libs/vte/vte-0.42.4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +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" + +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" + +RDEPEND=" + >=dev-libs/glib-2.40:2 + >=x11-libs/gtk+-3.8:3[introspection?] + >=x11-libs/pango-1.22.0 + + sys-libs/ncurses:0= + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXft + + glade? ( >=dev-util/glade-3.9:3.10 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) +" +DEPEND="${RDEPEND} + $(vala_depend) + >=dev-util/gtk-doc-am-1.13 + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + + crypt? ( >=net-libs/gnutls-3.2.7 ) +" +RDEPEND="${RDEPEND} + !x11-libs/vte:2.90[glade] +" + +src_prepare() { + if use termite-patch; then + # stg export -d /usr/local/portage/x11-libs/vte/files/vte-ng-0.42.4 -p -n + eshopts_push -u failglob + EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch "$FILESDIR/vte-ng-$PV" + eshopts_pop + fi + + vala_src_prepare + 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() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + gnome2_src_install + mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die +} -- cgit v1.2.1