From d65b00ca1cdf87c90789966c04aa666e7355b688 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sat, 1 Nov 2008 17:41:23 +0000 Subject: Include a fix for the previous patch, fixing selection clipboard retention from alternate screen (less, vim, etc) (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64) --- x11-libs/vte/ChangeLog | 11 ++++- .../vte-0.17.4-fix-highlighting-on-activity.patch | 48 ++++++++++++++++++++ .../vte-0.17.4-fix-selecting-on-activity.patch | 41 ----------------- x11-libs/vte/vte-0.17.4-r1.ebuild | 52 ---------------------- x11-libs/vte/vte-0.17.4-r2.ebuild | 52 ++++++++++++++++++++++ 5 files changed, 110 insertions(+), 94 deletions(-) create mode 100644 x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch delete mode 100644 x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch delete mode 100644 x11-libs/vte/vte-0.17.4-r1.ebuild create mode 100644 x11-libs/vte/vte-0.17.4-r2.ebuild (limited to 'x11-libs') diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index e3c3bf023882..3f84e284f191 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-libs/vte # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.211 2008/10/28 11:57:46 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.212 2008/11/01 17:41:23 leio Exp $ + +*vte-0.17.4-r2 (01 Nov 2008) + + 01 Nov 2008; Mart Raudsepp + +files/vte-0.17.4-fix-highlighting-on-activity.patch, + -files/vte-0.17.4-fix-selecting-on-activity.patch, -vte-0.17.4-r1.ebuild, + +vte-0.17.4-r2.ebuild: + Include a fix for the previous patch, fixing selection clipboard retention + from alternate screen (less, vim, etc) *vte-0.17.4-r1 (28 Oct 2008) diff --git a/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch b/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch new file mode 100644 index 000000000000..96c09b474f67 --- /dev/null +++ b/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch @@ -0,0 +1,48 @@ +Upstream revisions 2134 and 2135 with useless whitespace change hunks removed: + +2008-10-23 Chris Wilson + +Bug 557375 – >=vte-0.16.14 breaks highlighting on activity + +* src/vte.c (vte_terminal_deselect_all), +(vte_terminal_extend_selection): +After the user modifies the selection, copy it to PRIMARY and store +it on the terminal. This ensures that after a screen redraw, we +compare the contents of the selected region with the current +selection, instead of stale data. + +2008-10-31 Chris Wilson + +* src/vte.c (vte_terminal_deselect_all): +Preserve the copy of the selection until it is replace by a new +selection, so that we can perform asynchronous copies from the +clipboard. + +--- trunk/src/vte.c 2008/10/23 08:39:44 2130 ++++ trunk/src/vte.c 2008/10/31 12:59:29 2135 +@@ -1018,10 +1018,16 @@ + { + if (terminal->pvt->has_selection) { + gint sx, sy, ex, ey; +- terminal->pvt->has_selection = FALSE; ++ + _vte_debug_print(VTE_DEBUG_SELECTION, + "Deselecting all text.\n"); ++ ++ terminal->pvt->has_selection = FALSE; ++ /* Don't free the current selection, as we need to keep ++ * hold of it for async copying from the clipboard. */ ++ + vte_terminal_emit_selection_changed(terminal); ++ + sx = terminal->pvt->selection_start.x; + sy = terminal->pvt->selection_start.y; + ex = terminal->pvt->selection_end.x; +@@ -6510,6 +6514,7 @@ + terminal->pvt->selection_start.y, + terminal->pvt->selection_end.x, + terminal->pvt->selection_end.y); ++ vte_terminal_copy_primary(terminal); + vte_terminal_emit_selection_changed(terminal); + } + diff --git a/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch b/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch deleted file mode 100644 index 5cf9b91acfd6..000000000000 --- a/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream revision 2134 with useless whitespace change hunks removed: - -2008-10-23 Chris Wilson - -Bug 557375 – >=vte-0.16.14 breaks highlighting on activity - -* src/vte.c (vte_terminal_deselect_all), -(vte_terminal_extend_selection): -After the user modifies the selection, copy it to PRIMARY and store -it on the terminal. This ensures that after a screen redraw, we -compare the contents of the selected region with the current -selection, instead of stale data. - ---- trunk/src/vte.c 2008/10/23 09:15:37 2133 -+++ trunk/src/vte.c 2008/10/23 09:43:21 2134 -@@ -1018,10 +1018,16 @@ - { - if (terminal->pvt->has_selection) { - gint sx, sy, ex, ey; -- terminal->pvt->has_selection = FALSE; -+ - _vte_debug_print(VTE_DEBUG_SELECTION, - "Deselecting all text.\n"); -+ -+ terminal->pvt->has_selection = FALSE; -+ g_free (terminal->pvt->selection); -+ terminal->pvt->selection = NULL; -+ - vte_terminal_emit_selection_changed(terminal); -+ - sx = terminal->pvt->selection_start.x; - sy = terminal->pvt->selection_start.y; - ex = terminal->pvt->selection_end.x; -@@ -6510,6 +6514,7 @@ - terminal->pvt->selection_start.y, - terminal->pvt->selection_end.x, - terminal->pvt->selection_end.y); -+ vte_terminal_copy_primary(terminal); - vte_terminal_emit_selection_changed(terminal); - } - diff --git a/x11-libs/vte/vte-0.17.4-r1.ebuild b/x11-libs/vte/vte-0.17.4-r1.ebuild deleted file mode 100644 index fb3fd0839cd3..000000000000 --- a/x11-libs/vte/vte-0.17.4-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.17.4-r1.ebuild,v 1.1 2008/10/28 11:57:46 leio Exp $ - -inherit gnome2 eutils - -DESCRIPTION="Gnome terminal widget" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -# pcre is broken in this release -IUSE="debug doc python opengl" - -RDEPEND=">=dev-libs/glib-2.14 - >=x11-libs/gtk+-2.6 - >=x11-libs/pango-1.1 - >=media-libs/freetype-2.0.2 - media-libs/fontconfig - sys-libs/ncurses - opengl? ( - virtual/opengl - virtual/glu - ) - python? ( - >=dev-python/pygtk-2.4 - >=dev-lang/python-2.4.4-r5 - ) - x11-libs/libX11 - virtual/xft" - -DEPEND="${RDEPEND} - doc? ( >=dev-util/gtk-doc-1.0 ) - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - sys-devel/gettext" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable python) - $(use_with opengl glX) - --with-xft2 --with-pangox" -} - -src_unpack() { - gnome2_src_unpack - epatch "${FILESDIR}/${P}-fix-selecting-on-activity.patch" -} diff --git a/x11-libs/vte/vte-0.17.4-r2.ebuild b/x11-libs/vte/vte-0.17.4-r2.ebuild new file mode 100644 index 000000000000..79e1ff71311f --- /dev/null +++ b/x11-libs/vte/vte-0.17.4-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.17.4-r2.ebuild,v 1.1 2008/11/01 17:41:23 leio Exp $ + +inherit gnome2 eutils + +DESCRIPTION="Gnome terminal widget" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +# pcre is broken in this release +IUSE="debug doc python opengl" + +RDEPEND=">=dev-libs/glib-2.14 + >=x11-libs/gtk+-2.6 + >=x11-libs/pango-1.1 + >=media-libs/freetype-2.0.2 + media-libs/fontconfig + sys-libs/ncurses + opengl? ( + virtual/opengl + virtual/glu + ) + python? ( + >=dev-python/pygtk-2.4 + >=dev-lang/python-2.4.4-r5 + ) + x11-libs/libX11 + virtual/xft" + +DEPEND="${RDEPEND} + doc? ( >=dev-util/gtk-doc-1.0 ) + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + sys-devel/gettext" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable debug) + $(use_enable python) + $(use_with opengl glX) + --with-xft2 --with-pangox" +} + +src_unpack() { + gnome2_src_unpack + epatch "${FILESDIR}/${P}-fix-highlighting-on-activity.patch" +} -- cgit v1.2.3-65-gdbad