diff options
Diffstat (limited to 'x11-terms/gnome-terminal')
8 files changed, 10 insertions, 326 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog index 64cfba129da2..20d1114cb784 100644 --- a/x11-terms/gnome-terminal/ChangeLog +++ b/x11-terms/gnome-terminal/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-terms/gnome-terminal # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.291 2014/07/23 15:38:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.292 2014/11/13 12:42:16 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-terminal-3.10.2-sys-wait.h.patch, + -files/gnome-terminal-3.12.0-appmenu-parameter.patch, + -files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch, + -files/gnome-terminal-3.6.1-window-resize.patch, + -gnome-terminal-2.32.1-r1.ebuild, -gnome-terminal-3.10.2.ebuild, + -gnome-terminal-3.12.2.ebuild: + Drop old (#508854) 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-terminal-3.12.3.ebuild: Stable for x86, wrt bug #512012 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch deleted file mode 100644 index b51d03c0c55f..000000000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4c82fe8c37718ce2d6040a48d4e643ae6d862be6 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse <jasper@humppa.nl> -Date: Mon, 1 Apr 2013 11:23:36 +0200 -Subject: [PATCH] Pull in sys/wait.h for WIFEXITED/WEXITSTATUS - ---- - src/terminal-app.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 448e1ae..a92826c 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -41,6 +41,7 @@ - #include "terminal-defines.h" - #include "terminal-prefs.h" - -+#include <sys/wait.h> - #include <errno.h> - #include <string.h> - #include <stdlib.h> --- -1.9.1 - diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch deleted file mode 100644 index 46a0b8ffa0c3..000000000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d58bc01a2e891e31e11f03eb0d6ae9b5ff260b2b Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@gnome.org> -Date: Mon, 24 Mar 2014 15:16:22 +0100 -Subject: [PATCH 02/61] appmenu: Fix action parameter - -https://bugzilla.gnome.org/show_bug.cgi?id=726942 ---- - src/terminal-appmenu.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/terminal-appmenu.ui b/src/terminal-appmenu.ui -index 148c640..01ff5a8 100644 ---- a/src/terminal-appmenu.ui -+++ b/src/terminal-appmenu.ui -@@ -21,7 +21,7 @@ - <item> - <attribute name="label" translatable="yes">_New Terminal</attribute> - <attribute name="action">win.new-terminal</attribute> -- <attribute name="target">'default'</attribute> -+ <attribute name="target" type="(ss)">('default','default')</attribute> - </item> - </section> - <section> --- -1.9.0 - diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch deleted file mode 100644 index 369bc9e61064..000000000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ce8ba57e66b1e7dca878a446ce13977a33827feb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Mon, 21 Jan 2013 15:11:54 -0500 -Subject: [PATCH] Don't check for gnome-doc-utils, we are no longer using them. - -Restore GNOME_COMMON_INIT to match gnome-terminal 3.7.x. ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bfa1c8a..e056d16 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,8 +32,7 @@ AC_HEADER_STDC - AM_PROG_LIBTOOL - IT_PROG_INTLTOOL([0.40.0]) - --# User documentation --YELP_HELP_INIT -+GNOME_COMMON_INIT - - GNOME_DEBUG_CHECK - -@@ -154,7 +153,7 @@ AC_SUBST([GTK_BUILDER_CONVERT_FLAGS]) - # Documentation - # ************* - --GNOME_DOC_INIT -+YELP_HELP_INIT - - # **************************** - --- -1.8.1.1 - diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch deleted file mode 100644 index efe60b991e51..000000000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12 Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@gnome.org> -Date: Wed, 16 Jan 2013 22:52:03 +0100 -Subject: [PATCH] window: Use the geometry of the active screen - -When we get the restyle on focus-out, the screens call terminal_window_set_size() -directly. This was causing the window to revert to a previous size, see bug -https://bugzilla.gnome.org/show_bug.cgi?id=688959 . ---- - src/terminal-window.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index ed509ba..1740247 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2330,6 +2330,10 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - int grid_width; - int grid_height; - -+ /* Only update the geometry from the active screen. */ -+ if (window->priv->active_screen != screen) -+ return; -+ - /* be sure our geometry is up-to-date */ - terminal_window_update_geometry (window); - --- -1.8.1.1 - diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild deleted file mode 100644 index 1595771f00ab..000000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 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.32.1-r1.ebuild,v 1.12 2014/01/02 23:58:54 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" -IUSE="" - -# libgnome needed for some monospace font schema, bug #274638 -RDEPEND=">=dev-libs/glib-2.25.12:2 - >=x11-libs/gtk+-2.18:2 - >=gnome-base/gconf-2.31.3 - >=x11-libs/vte-0.26.0:0 - x11-libs/libICE - x11-libs/libSM - gnome-base/libgnome" -DEPEND="${RDEPEND} - || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - >=app-text/gnome-doc-utils-0.3.2 - >=app-text/scrollkeeper-0.3.11" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -src_prepare() { - # fix underlinking, bug #496804; avoid eautoreconf - sed -e 's/SMCLIENT_PKGS="sm"/SMCLIENT_PKGS="sm ice"/' -i configure.ac configure || die - gnome2_src_prepare -} - -pkg_postinst() { - gnome2_pkg_postinst - if [[ ${REPLACING_VERSIONS} < 2.32.1-r1 ]]; then - elog "Gnome Terminal no longer uses login shell by default, switching" - elog "to upstream default. Because of this, if you have some command you" - elog "want to be run, be sure to have it placed in your ~/.bashrc file." - fi -} diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild deleted file mode 100644 index f3dfc30fa19d..000000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.6 2014/03/25 04:08:58 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 readme.gentoo - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://help.gnome.org/users/gnome-terminal/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+nautilus" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: automagic dependency on gtk+[X] -RDEPEND=" - >=dev-libs/glib-2.33.2:2 - >=x11-libs/gtk+-3.6:3[X] - >=x11-libs/vte-0.34.9:2.90 - >=gnome-base/dconf-0.12 - >=gnome-base/gconf-2.31.3 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - x11-libs/libSM - x11-libs/libICE - nautilus? ( >=gnome-base/nautilus-3 ) -" -# gtk+:2 needed for gtk-builder-convert, bug 356239 -DEPEND="${RDEPEND} - || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) - >=dev-util/intltool-0.40 - >=gnome-base/dconf-0.14.0 - sys-devel/gettext - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened - tab you will need to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte.sh" - -src_prepare() { - # patch from 3.12, fixes buld on non-glibc systems - epatch "${FILESDIR}/${PN}-3.10.2-sys-wait.h.patch" - - gnome2_src_prepare -} - -src_configure() { - # FIXME: leave smclient configure unset until it accepts values from the - # switch and not from GDK_TARGET, bug #363033 - gnome2_src_configure \ - --disable-static \ - --enable-migration \ - $(use_with nautilus nautilus-extension) \ - ITSTOOL=$(type -P true) -} - -src_install() { - DOCS="AUTHORS ChangeLog HACKING NEWS" - gnome2_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 && - ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then - elog - elog "Gnome Terminal no longer uses login shell by default, switching" - elog "to upstream default. Because of this, if you have some command you" - elog "want to be run, be sure to have it placed in your ~/.bashrc file." - elog - fi - readme.gentoo_print_elog -} diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild deleted file mode 100644 index 6c5317d4412f..000000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild,v 1.1 2014/05/31 09:27:18 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 readme.gentoo - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+gnome-shell +nautilus" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: automagic dependency on gtk+[X] -RDEPEND=" - >=dev-libs/glib-2.39.2:2 - >=x11-libs/gtk+-3.9.9:3[X] - >=x11-libs/vte-0.36.1:2.90 - >=gnome-base/dconf-0.14 - >=gnome-base/gconf-2.31.3 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - x11-libs/libSM - x11-libs/libICE - gnome-shell? ( gnome-base/gnome-shell ) - nautilus? ( >=gnome-base/nautilus-3 ) -" -# gtk+:2 needed for gtk-builder-convert, bug 356239 -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/appdata-tools - || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened - tab you will need to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte.sh" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-0.patch \ - "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-1.patch \ - "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-2.patch \ - "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-3.patch \ - "${FILESDIR}"/${PN}-3.12.0-fallback-title-1.patch \ - "${FILESDIR}"/${PN}-3.12.0-fallback-title-2.patch - - gnome2_src_prepare -} -src_configure() { - # FIXME: leave smclient configure unset until it accepts values from the - # switch and not from GDK_TARGET, bug #363033 - gnome2_src_configure \ - --disable-static \ - --enable-migration \ - $(use_enable gnome-shell search-provider) \ - $(use_with nautilus nautilus-extension) \ - # Docs are broken in this release. - #ITSTOOL=$(type -P true) \ - #XMLLINT=$(type -P true) -} - -src_install() { - DOCS="AUTHORS ChangeLog HACKING NEWS" - gnome2_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} |