From 370a084ac411af803442d97aabd50a8e780d37a5 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 4 Aug 2008 18:47:20 +0000 Subject: Pull 2.22.3-r1 from portage svn path=/maintainer/; revision=95 --- x11-terms/gnome-terminal/Manifest | 2 + .../gnome-terminal-2.22.3-tab-close-fix.patch | 29 +++++++++++ .../gnome-terminal/gnome-terminal-2.22.3-r1.ebuild | 60 ++++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch create mode 100644 x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 6e399f8..c79c474 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,5 +1,7 @@ AUX gnome-terminal-2-dnd_url_add_space.patch 1000 RMD160 e83cf094681389b3a82b5f9c5cd40431ccaef810 SHA1 468cd7aae84d809b714b8bc15e2e903deb437621 SHA256 d807989dc7aec88f1d01e9449a5d44232e5d01fb64bea91fb2a181bf3080116c AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892 AUX gnome-terminal-2.22.1-orange-cursor.patch 892 RMD160 23d3dae3715bd06e4219554f9611387a023cde6d SHA1 e9e3985c6b494aa9a048aff89f2e3b0711b04f8d SHA256 571af26e6223ce03977881bb7ddb6d80025b5d7617ac51bb08ea11ba002ef4c4 +AUX gnome-terminal-2.22.3-tab-close-fix.patch 1025 RMD160 a3020d4e74d0bc536786399e34dae1ff64b7bcd6 SHA1 397ae4e550536599d5013a340a92481c05f45011 SHA256 1677d7aee5186b296a1d8103c109e12bb93a7d80c29c3dcd007772e96a619db2 DIST gnome-terminal-2.22.3.tar.bz2 1803177 RMD160 f90e99dbff067425b7bb7f373565485f7e60f04c SHA1 8aaf556134884d3f7430e7966ff2c87df5843e3e SHA256 fffe2b352167fa42680cae79be80c5082cd4a04f712564bc4ae5ff0253509cd7 +EBUILD gnome-terminal-2.22.3-r1.ebuild 1801 RMD160 f2fb44fe6c8f2da3e8f2eb75387a1e1ee94b698e SHA1 cfcb8427cd6a6bb9b6a1c78fc0bc769e25311e14 SHA256 da1aad70a58b8194391d2a7fa993e7614089f3e9157ae762f6efa35cfa21b170 EBUILD gnome-terminal-2.22.3.ebuild 1716 RMD160 c2d8e5883c50fdcb25011076ca73e05523d92335 SHA1 5da31821272a7926241ccc62676b0f127e041c02 SHA256 808c51b6800668623252a12fe19d6b6edd0b983525f529a2f35d81dfae265bf8 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch new file mode 100644 index 0000000..34f26d9 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch @@ -0,0 +1,29 @@ +diff -urNp gnome-terminal-2.22.3-orig/src/terminal-window.c gnome-terminal-2.22.3/src/terminal-window.c +--- gnome-terminal-2.22.3-orig/src/terminal-window.c 2008-08-01 16:23:04.000000000 +0530 ++++ gnome-terminal-2.22.3/src/terminal-window.c 2008-08-01 23:29:19.000000000 +0530 +@@ -1367,14 +1367,9 @@ selection_changed_callback (TerminalScre + } + + static void +-close_button_clicked_cb (GtkWidget *widget, GtkWidget *screen) ++close_button_clicked_cb (GtkWidget *widget, TerminalScreen *screen) + { +- GtkWidget *notebook; +- guint page_num; +- +- notebook = gtk_widget_get_parent (GTK_WIDGET (screen)); +- page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), screen); +- gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num); ++ terminal_screen_close (screen); + } + + static void +@@ -1458,8 +1453,6 @@ terminal_window_add_screen (TerminalWind + if (old == window) + return; + +- g_object_ref (G_OBJECT (screen)); /* make our own new refcount */ +- + if (old) + terminal_window_remove_screen (old, screen); + diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild new file mode 100644 index 0000000..ba1545d --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild,v 1.1 2008/08/03 17:57:39 eva Exp $ + +inherit eutils gnome2 autotools + +DESCRIPTION="The Gnome Terminal" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="virtual/xft + >=dev-libs/glib-2.15.2 + >=x11-libs/gtk+-2.12 + >=gnome-base/gconf-2.14 + >=x11-libs/startup-notification-0.8 + >=x11-libs/vte-0.15.3 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2.14 + >=gnome-base/libgnomeui-2" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + >=app-text/gnome-doc-utils-0.3.2 + >=app-text/scrollkeeper-0.3.11" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +src_unpack() { + gnome2_src_unpack + + # Use login shell by default (#12900) + epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch + + # terminal enhancement, inserts a space after a DND URL + # patch by Zach Bagnall in #13801 + epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch + + # Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340 + # Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=523737 + sed -i -e '/DISABLE_DEPRECATED/d' \ + "${S}/src/Makefile.am" "${S}/src/Makefile.in" + + # Fix extra refs on tabs, bug #219964 + epatch "${FILESDIR}/${P}-tab-close-fix.patch" + + # patch gnome terminal to report as GNOME rather than xterm + # This needs to resolve a few bugs (#120294,) + # Leave out for now; causing too many problems + #epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch + + # Orange cursor + epatch "${FILESDIR}"/${PN}-2.22.1-orange-cursor.patch + + eautomake +} -- cgit v1.2.3-65-gdbad