diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-08-13 22:45:30 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-08-13 22:45:30 +0000 |
commit | 64f055dd72624d7f8a2d965ccaa427c6a3ac4b87 (patch) | |
tree | 6f09b02b495d5b95c4ace991c924ff803f9df40a /x11-libs | |
parent | Drop old snapshot. Fix klash patch, bug #332673. (diff) | |
download | gentoo-2-64f055dd72624d7f8a2d965ccaa427c6a3ac4b87.tar.gz gentoo-2-64f055dd72624d7f8a2d965ccaa427c6a3ac4b87.tar.bz2 gentoo-2-64f055dd72624d7f8a2d965ccaa427c6a3ac4b87.zip |
Clean up old revisions.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/vte/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch | 48 | ||||
-rw-r--r-- | x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch | 45 | ||||
-rw-r--r-- | x11-libs/vte/vte-0.17.4-r3.ebuild | 54 | ||||
-rw-r--r-- | x11-libs/vte/vte-0.20.5.ebuild | 48 | ||||
-rw-r--r-- | x11-libs/vte/vte-0.24.2.ebuild | 58 |
6 files changed, 7 insertions, 254 deletions
diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index 14b0e06b2753..2c18bb93d677 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/vte # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.255 2010/08/01 11:12:35 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.256 2010/08/13 22:45:30 eva Exp $ + + 13 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> -vte-0.17.4-r3.ebuild, + -files/vte-0.17.4-fix-highlighting-on-activity.patch, + -files/vte-0.17.4-no-null-backspace.patch, -vte-0.20.5.ebuild, + -vte-0.24.2.ebuild: + Clean up old revisions. 01 Aug 2010; Christian Faulhammer <fauli@gentoo.org> vte-0.24.3.ebuild: x86 stable, bug 324077 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 deleted file mode 100644 index 96c09b474f67..000000000000 --- a/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch +++ /dev/null @@ -1,48 +0,0 @@ -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-no-null-backspace.patch b/x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch deleted file mode 100644 index 734e7b530ce4..000000000000 --- a/x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.17.4.orig/src/vte.c vte-0.17.4/src/vte.c ---- vte-0.17.4.orig/src/vte.c 2008-09-08 15:48:31.000000000 -0400 -+++ vte-0.17.4/src/vte.c 2008-12-08 22:22:38.000000000 -0500 -@@ -4636,6 +4636,7 @@ vte_terminal_key_press(GtkWidget *widget - - /* Now figure out what to send to the child. */ - if ((event->type == GDK_KEY_PRESS) && !modifier) { -+ cc_t erase = VTE_VDISABLE; - handled = FALSE; - /* Map the key to a sequence name if we can. */ - switch (keyval) { -@@ -4661,11 +4662,15 @@ vte_terminal_key_press(GtkWidget *widget - if (terminal->pvt->pty_master != -1) { - if (tcgetattr(terminal->pvt->pty_master, - &tio) != -1) { -- normal = g_strdup_printf("%c", -- tio.c_cc[VERASE]); - normal_length = 1; -+ erase = tio.c_cc[VERASE]; - } - } -+ if (erase == VTE_VDISABLE) -+ normal = g_strdup(""); /* Fallback value. */ -+ else -+ normal = g_strdup_printf("%c", erase); -+ normal_length = 1; - suppress_meta_esc = FALSE; - break; - } -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.17.4.orig/src/vte-private.h vte-0.17.4/src/vte-private.h ---- vte-0.17.4.orig/src/vte-private.h 2008-09-08 15:48:31.000000000 -0400 -+++ vte-0.17.4/src/vte-private.h 2008-12-08 22:22:38.000000000 -0500 -@@ -91,6 +91,12 @@ G_BEGIN_DECLS - #define VTE_MAX_PROCESS_TIME 100 - #define VTE_CELL_BBOX_SLACK 1 - -+#ifdef _POSIX_VDISABLE /* From unistd.h */ -+#define VTE_VDISABLE _POSIX_VDISABLE -+#else -+#define VTE_VDISABLE '\0' -+#endif -+ - /* The structure we use to hold characters we're supposed to display -- this - * includes any supported visible attributes. */ - struct vte_charcell { diff --git a/x11-libs/vte/vte-0.17.4-r3.ebuild b/x11-libs/vte/vte-0.17.4-r3.ebuild deleted file mode 100644 index d9e092d6e5e6..000000000000 --- a/x11-libs/vte/vte-0.17.4-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 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-r3.ebuild,v 1.10 2009/04/28 11:03:52 armin76 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 - x11-libs/libXft" - -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" - # Bug #249618 - epatch "${FILESDIR}/${P}-no-null-backspace.patch" -} diff --git a/x11-libs/vte/vte-0.20.5.ebuild b/x11-libs/vte/vte-0.20.5.ebuild deleted file mode 100644 index a2643f359241..000000000000 --- a/x11-libs/vte/vte-0.20.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.20.5.ebuild,v 1.9 2010/01/16 17:14:19 armin76 Exp $ - -EAPI="2" - -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" -IUSE="debug doc glade python" - -RDEPEND=">=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.14.0 - >=x11-libs/pango-1.22.0 - sys-libs/ncurses - glade? ( dev-util/glade:3 ) - python? ( >=dev-python/pygtk-2.4 ) - x11-libs/libX11 - x11-libs/libXft" - -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} - --disable-deprecation - --disable-static - $(use_enable debug) - $(use_enable glade glade-catalogue) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" -} diff --git a/x11-libs/vte/vte-0.24.2.ebuild b/x11-libs/vte/vte-0.24.2.ebuild deleted file mode 100644 index b20fe9d324ce..000000000000 --- a/x11-libs/vte/vte-0.24.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.24.2.ebuild,v 1.1 2010/06/23 15:01:20 pacho Exp $ - -EAPI="2" - -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" -IUSE="debug doc glade python" - -RDEPEND=">=dev-libs/glib-2.22.0 - >=x11-libs/gtk+-2.14.0 - >=x11-libs/pango-1.22.0 - sys-libs/ncurses - glade? ( dev-util/glade:3 ) - python? ( >=dev-python/pygtk-2.4 ) - x11-libs/libX11 - x11-libs/libXft" -DEPEND="${RDEPEND} - doc? ( >=dev-util/gtk-doc-1.13 ) - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - sys-devel/gettext" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-deprecation - --disable-static - $(use_enable debug) - $(use_enable glade glade-catalogue) - $(use_enable python) - --with-html-dir=/usr/share/doc/${PF}/html" -} - -src_prepare() { - gnome2_src_prepare - - # Fix ugly artifacts with upstream patches from bgo#618749 - # FIXME: Second patch needs to be skipped since it causes problems with - # x11-terms/terminal, see bug #324631. If this is not solved by upstream, - # the problem could reappear with >=x11-libs/vte-0.25.2 - epatch "${FILESDIR}/${PN}-0.24.1-background-color.patch" -# epatch "${FILESDIR}/${PN}-0.24.1-background-color2.patch" - epatch "${FILESDIR}/${PN}-0.24.1-cleanup-background.patch" - - # Prevent cursor from become invisible, bgo#602596 - # FIXME: The following patches cannot be applied until bug #323443 is solved. -# epatch "${FILESDIR}/${PN}-0.24.2-invisible-cursor.patch" -# epatch "${FILESDIR}/${PN}-0.24.2-invisible-cursor2.patch" -} |