dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 11:42:40 +01:00
Code Issues Releases Wiki Activity

- x11-terms/gnome-terminal: stabilize 3.14.3 remove old.

Browse Source
This commit is contained in:
layman
2015-07-15 21:53:22 +02:00
parent 4203472fbd
commit ddfd55bc41
5 changed files with 3 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
x11-terms/gnome-terminal/Manifest
View File

@@ -4,5 +4,5 @@ AUX gnome-terminal-3.14.2-title-option.patch 6329 SHA256 0ea6adbf45632b42942f15f
DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f
DIST gnome-terminal-3.14.3.tar.xz 1781712 SHA256 db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3 SHA512 21e1292391d77a658b01be12ca7f2f5a8f2f504ef9c57c587dc699e455fc4e052e65c90111ffd7ceb8c23422b60d75a0dffca699e57a2af245277e25f38f0655 WHIRLPOOL db3870d34d5bffce3493af3c1eff479633553b570d9c462bbe7ed4a5bb2305011b45a912331d5d9649d68918a6c9fd80c11bd5d9fb8599a66437a5fd2105089c
EBUILD gnome-terminal-3.14.2-r2.ebuild 2262 SHA256 79c015c131bb983d845046ee57b2dbb14789326db606db47f0bf76d11a45a803 SHA512 fcce249b7564aa55f16cb11d666e1f4d110efb966e880b57bce7789934940283b1c6acc26612cc0aea9cfef0bf0edc7f9443e97dd8e9fa34713f1792e4f4ab2b WHIRLPOOL b3251d097e780a2481cc180837fb7ebb079cb1624255bad93d96e06e2ba777812c113564b02fc8bbbbe3b5724fe9414e53501bf599ec1e09dccdea5474955100
EBUILD gnome-terminal-3.14.3.ebuild 1964 SHA256 0b1ebc20db90de1a008d1c5abbcd26f3321e947276896e177c40283b2bcc82fb SHA512 502224b0708b31db7276a3557cb656a555a981d8fc9742691b190d41e3a0278ccda204f9999c084385efc91faf8efbc67852229301efb4bbe6b457e71ddba76d WHIRLPOOL 19549fe76ce8b36a118f7ec74d687f22cada18a0928e9a48e4327b449ccb13c3bad80fb40d89b26b901077ce61af2a9e0ba9ddc8fb63b5a9d478d0497ecef132
EBUILD gnome-terminal-3.14.3.ebuild 1844 SHA256 3d2ebe879821e85f173da3816adf7e34a74d0372ec63bb4bed26d34edc41fcdd SHA512 074d4c90c4cad26d49deda30f1c7becb9a66cf3f646b902402e571d22a5fc38e1ed47c2194a3dfd3d26507a66f865344ef536806a6e747aac9baff1f428de6f3 WHIRLPOOL ef4901ec2bdef591f5ea473758e2d825f88f789a2a92d4598584563b0c1ca2bbbe93ae1e33ac97fafafff576a8a89e4709f64409efe63ad2649d77e67a4830d5
MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5

26
x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
View File

@@ -1,26 +0,0 @@
From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001
From: Egmont Koblinger <egmont@gmail.com>
Date: Thu, 8 Jan 2015 14:33:13 +0100
Subject: screen: Fix crash with empty child process command line
https://bugzilla.gnome.org/show_bug.cgi?id=742560
(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index ad78388..9f63239 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
if (process_name)
gs_transfer_out_value (process_name, &name);
- for (i = 0; i < len - 1; i++)
+ if (len > 0 && data[len - 1] == '\0')
+ len--;
+ for (i = 0; i < len; i++)
{
if (data[i] == '\0')
data[i] = ' ';
--
cgit v0.10.1

166
x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
View File

@@ -1,166 +0,0 @@
From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sat, 15 Nov 2014 21:11:08 +0100
Subject: client: Hide obsolete --title option
Accept it for compatibility, but ignore it.
https://bugzilla.gnome.org/show_bug.cgi?id=740188
(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123)
diff --git a/src/gterminal.vala b/src/gterminal.vala
index cf1ffae..7e55678 100644
--- a/src/gterminal.vala
+++ b/src/gterminal.vala
@@ -233,7 +233,6 @@ namespace GTerminal
public static string? working_directory = null;
public static string? profile = null;
- public static string? title = null;
public static double zoom = 1.0;
private static bool option_profile (string option_name,
@@ -269,8 +268,6 @@ namespace GTerminal
{ "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile,
N_("Use the given profile instead of the default profile"),
N_("UUID") },
- { "title", 0, 0, OptionArg.STRING, ref title,
- N_("Set the terminal title"), N_("TITLE") },
{ "cwd", 0, 0, OptionArg.FILENAME, ref working_directory,
N_("Set the working directory"), N_("DIRNAME") },
{ "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom,
@@ -418,7 +415,7 @@ namespace GTerminal
OpenOptions.geometry,
OpenOptions.role,
OpenOptions.profile,
- OpenOptions.title,
+ null /* title */,
OpenOptions.maximise,
OpenOptions.fullscreen);
if (OpenOptions.show_menubar_set)
diff --git a/src/terminal-options.c b/src/terminal-options.c
index 75fc64d..0280f11 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */)
it->profile = profile;
it->exec_argv = NULL;
- it->title = NULL;
it->working_dir = NULL;
it->zoom = 1.0;
it->zoom_set = FALSE;
@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it)
{
g_free (it->profile);
g_strfreev (it->exec_argv);
- g_free (it->title);
g_free (it->working_dir);
g_slice_free (InitialTab, it);
}
@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name,
}
static gboolean
-option_title_callback (const gchar *option_name,
- const gchar *value,
- gpointer data,
- GError **error)
-{
- TerminalOptions *options = data;
-
- if (options->initial_windows)
- {
- InitialTab *it = ensure_top_tab (options);
-
- g_free (it->title);
- it->title = g_strdup (value);
- }
- else
- {
- g_free (options->default_title);
- options->default_title = g_strdup (value);
- }
-
- return TRUE;
-}
-
-static gboolean
option_working_directory_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory,
options->initial_windows = NULL;
options->default_role = NULL;
options->default_geometry = NULL;
- options->default_title = NULL;
options->zoom = 1.0;
options->zoom_set = FALSE;
@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options,
/* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL);
it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/
it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL);
- it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL);
if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) &&
!(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error)))
@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options)
g_free (options->default_role);
g_free (options->default_geometry);
g_free (options->default_working_dir);
- g_free (options->default_title);
g_free (options->default_profile);
g_strfreev (options->exec_argv);
@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options)
{
"title",
't',
- 0,
+ G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
- option_title_callback,
- N_("Set the terminal title"),
- N_("TITLE")
+ unsupported_option_callback,
+ NULL, NULL
},
{
"working-directory",
diff --git a/src/terminal-options.h b/src/terminal-options.h
index a1e645b..17f42b4 100644
--- a/src/terminal-options.h
+++ b/src/terminal-options.h
@@ -75,7 +75,6 @@ typedef struct
char *default_role;
char *default_geometry;
char *default_working_dir;
- char *default_title;
char **exec_argv;
char *default_profile;
gboolean default_profile_is_id;
@@ -95,7 +94,6 @@ typedef struct
char *profile;
gboolean profile_is_id;
char **exec_argv;
- char *title;
char *working_dir;
double zoom;
guint zoom_set : 1;
diff --git a/src/terminal.c b/src/terminal.c
index 2dd5a6d..b6a6f5e 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory,
iw->geometry,
iw->role,
it->profile ? it->profile : options->default_profile,
- it->title ? it->title : options->default_title,
+ NULL /* title */,
iw->start_maximized,
iw->start_fullscreen);
--
cgit v0.10.1

81
x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
View File

@@ -1,81 +0,0 @@
# Copyright 1999-2015 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.14.2-r2.ebuild,v 1.4 2015/05/19 14:10:09 tetromino 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="debug +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.40:2[dbus]
>=x11-libs/gtk+-3.10:3[X]
>=x11-libs/vte-0.38:2.91
>=gnome-base/dconf-0.14
>=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
# itstool required for help/* with non-en LINGUAS, see bug #549358
# xmllint required for glib-compile-resources, see bug #549304
DEPEND="${RDEPEND}
app-text/yelp-tools
dev-libs/libxml2
dev-util/appdata-tools
dev-util/gdbus-codegen
|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
dev-util/itstool
>=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() {
# client: Hide obsolete --title option (from '3.14')
epatch "${FILESDIR}/${P}-title-option.patch"
# screen: Fix crash with empty child process command line (from '3.14')
epatch "${FILESDIR}/${P}-fix-crash.patch"
epatch "${FILESDIR}/${PN}-3.14-restore-transparency.patch"
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-static \
--disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
VALAC=$(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
}

4
x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
View File

@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.14.3.ebuild,v 1.2 2015/05/19 14:10:09 tetromino Exp $
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
LICENSE="GPL-3+"
SLOT="0"
IUSE="debug +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"
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="