From cda754c221d6da504ab75fc90936d77532392939 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sun, 15 Mar 2015 19:43:55 +0100 Subject: [PATCH] - x11-terms/gnome-terminal: Bump to 3.14.2-r2. --- x11-terms/gnome-terminal/Manifest | 5 + .../gnome-terminal-3.14.2-fix-crash.patch | 26 ++ ...terminal-3.14.2-restore-transparency.patch | 328 ++++++++++++++++++ .../gnome-terminal-3.14.2-title-option.patch | 166 +++++++++ .../gnome-terminal-3.14.2-r2.ebuild | 80 +++++ 5 files changed, 605 insertions(+) create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-restore-transparency.patch create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch create mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index c26e773..86e5b84 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -5,6 +5,11 @@ AUX gnome-terminal-3.12.0-remove-set-title-feature-0.patch 5613 SHA256 9288c88b0 AUX gnome-terminal-3.12.0-remove-set-title-feature-1.patch 8886 SHA256 75b99525a8bd7cba13c25069dd549ac9492a6423a15b99ed2713a9a9a217c2bb SHA512 4e32e85b6b4601fca23e723f999376437eaf82e4bfdd98ac79bd3a590b0d6cadfe29755e1cfb434f15fb68abe240dd3e5ea55f8724c00ac8bc229556e69e3305 WHIRLPOOL eafe812c320a19655b3f5c7ffc7e147c9daa64cc87b00e09f791d2a056ed41c988f1a5a6e45d547466881d3270c6a505c4b7a8f03e00b300b8de17740620ddbf AUX gnome-terminal-3.12.0-remove-set-title-feature-2.patch 10871 SHA256 6871c5372b0f9af73cce4e816dd75e077f717b1030c4be0416b912ffb4e965d3 SHA512 97dedb17d542f18ab6280cbfe16bbeeb77b8f9b1761898f50e471d091ec445229c83d9f07960a34011c3d32d316c898e1d3846c8d6c847b92ea95aac7d00d248 WHIRLPOOL b611cc240664068d5f772658a28ef2f330dd4e5ae8ec8ef865c551f60da9e74fe7b317842bd56551ad7cd1e69b0698943cb2b7be67bfe0928bc3267efe39f682 AUX gnome-terminal-3.12.0-remove-set-title-feature-3.patch 5952 SHA256 ef6d829de0e87ccc1784ce437cc98ded1322ee6dcd6fd23deebe170ef6eade26 SHA512 a80dd10f5f0c2b0da4bfde579e38197958dd8de746fa19d634f2e10fc54e7f60e56c47eb2448ee166758d7c7b196af21c4f4859d5fd27cfef856bc1b50670da3 WHIRLPOOL 2aa15816a19c3f663c908a8aba0652292a5c19be5f29d9aa25696bc2368c578ac7f44fca0f8ec4139e89f6f2caa4def38ab769e38616e0ac5034549500e4d183 +AUX gnome-terminal-3.14.2-fix-crash.patch 832 SHA256 19dbb2ac1cd5ce46106570678cd65dc3a76e3fdbcad87d22bfa12d4612075bc2 SHA512 649c9da52650b9d6a59989fd5dfcf763dac0a37b695c593539d3e483f8c986ca17da33647fc3dc83513b38a254c5202af7f4fca073129074c0e4f029e4c9f7ec WHIRLPOOL 59d517ef092463738490105a4953d0cabb3ebac4cd3d8f9895d1f6753996ad14c916a8e46b097d9a09f7a4021465029cf470ea64d3e81d3285670bdc190bc932 +AUX gnome-terminal-3.14.2-restore-transparency.patch 15730 SHA256 ae62bc139a40066d624cee13befd0a0a747fed5e3acfb98782ab7a31796f2510 SHA512 37204eadb61f64a5107203d54d65730ec859732cb71f09cfbb5cd60b25080025acc4e94d643fb55c3822bc7cede1a7759692e2ff672f80d0a4ab4d1e0f0f2cb7 WHIRLPOOL 059b38d79b6e89ed740f00d6759cf93fcb2864be09d2b1644a2e8a9d7e2f9461adad4e4f20ade5a94342b032e102c2e31c236e863f287f063b4cb0d4c3429e39 +AUX gnome-terminal-3.14.2-title-option.patch 6329 SHA256 0ea6adbf45632b42942f15f58666414ff65c9e9fc85a0293b6cba9d4909c2fd4 SHA512 cbc641c6c3e822e29db2d5b18f979d942f59de279e2453c800ee043eedbc68f4682ca6d53428a2394ef650ac654e5077641fa19b68cd841fb3c68d273198b3f2 WHIRLPOOL e4a415a1d4b0d26f6804f1410952eb55e064bc38981c716b8f55ef54e13890ebfad6501f2fe4a163b0654d02b5d56045267c5093569ea2a3aa6d8d86bb1e321a DIST gnome-terminal-3.12.3.tar.xz 1720988 SHA256 8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528 SHA512 b155600483129c0e592d0a9604fd7826f2f41633bebf9df5ed459b12c154d3f1e505b10a93e129c22b24215b7cdaa97acac9c4897a85256553fda1394e76ac48 WHIRLPOOL 6fbd2cd546e45a95a37493443c7e34c73dd17b39884882ff4cc4a46b4c5d189d7601f35b2f0ad39535c9693f55b84a9d46bc1d3a8404537dc0d5c26b415e5e0f +DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f EBUILD gnome-terminal-3.12.3.ebuild 2286 SHA256 a910b916275b6e0d49748f4fb08c514cee359f5970d2e55ebe981409c22ff923 SHA512 5c43c7d9f57381646c04d5d6f2c23c8ffbe5faeab9ad6600283daa33779c8e175f35f7679ae098d22488dfd4ee9d50035461d53bf274ff263525ebe4b81777c0 WHIRLPOOL 10b175fd823f0a515c7d9fde22a90193220bfc5881f61e6800365e0b334c98014f43109e2134b15bbd5050fcab5e9dfeb60420c133fd05a8433821491bbe7999 +EBUILD gnome-terminal-3.14.2-r2.ebuild 2179 SHA256 6b810a0085676a0b269d440f7763dd107534234186de6ed20f3a5702944d26b2 SHA512 28dfb57462a115383c1b82609d14968c3a69189477f07ad001d368dd55b393cc99df6e40b593499b14b510c1e074834e7cf976b459de1db6ef346770ef01ed0e WHIRLPOOL 3d670a8f048610bf1d71c76b71bb597547d3b00774c23e303643ac19a998e1a75146b2c27d475a0c1eac5e7a6535611728105f76df9c743fb45f0c4b5662b08a MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch new file mode 100644 index 0000000..40ddbc0 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch @@ -0,0 +1,26 @@ +From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001 +From: Egmont Koblinger +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 + diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-restore-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-restore-transparency.patch new file mode 100644 index 0000000..7cb3732 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-restore-transparency.patch @@ -0,0 +1,328 @@ +From 1cb63cd1c90cb5bfc8ed2e6d161a7b96c51d8a29 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 12 May 2014 14:57:18 +0200 +Subject: [PATCH 1/2] Restore transparency + +The transparency settings were removed as a side effect of +2bff4b63ed3ceef6055e35563e9b0b33ad57349d + +This restores them and you will need a compositing window manager to +use it. The background image setting, also known as faux transparency, +was not restored. +--- + src/org.gnome.Terminal.gschema.xml | 10 +++++ + src/profile-editor.c | 11 +++++ + src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++ + src/terminal-schemas.h | 3 ++ + src/terminal-screen.c | 22 ++++++++- + src/terminal-window.c | 7 +++ + 6 files changed, 144 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index c7d0edb..8910ddd 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -318,6 +318,16 @@ + 'narrow' + Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding + ++ ++ false ++ Whether to use a transparent background ++ ++ ++ 50 ++ ++ Adjust the amount of transparency ++ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. ++ + + + +diff --git a/src/profile-editor.c b/src/profile-editor.c +index 8e5732d..dac5341 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings *profile, + "active-id", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + ++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "use-transparent-background"), ++ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "background-transparent-scale-box"), ++ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, ++ gtk_builder_get_object (builder, "background-transparent-adjustment"), ++ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ + /* Finished! */ ++ + terminal_util_bind_mnemonic_label_sensitivity (editor); + + terminal_util_dialog_focus_widget (editor, widget_name); +diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui +index de901ee..25a284e 100644 +--- a/src/profile-preferences.ui ++++ b/src/profile-preferences.ui +@@ -23,6 +23,11 @@ + 1 + 100 + ++ ++ 100 ++ 1 ++ 10 ++ + + + +@@ -1073,6 +1078,93 @@ + 1 + + ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Use t_ransparent background ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ False ++ horizontal ++ 6 ++ ++ ++ True ++ False ++ 0.5 ++ none ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ background-transparent-adjustment ++ False ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 0.5 ++ full ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 2 ++ ++ + + + +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index 90cc5a0..a3849eb 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -63,6 +63,9 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_USE_THEME_COLORS_KEY "use-theme-colors" + #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" + ++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" ++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" ++ + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" + #define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index ad78388..d09d812 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) || +- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) ++ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || ++ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || ++ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) + update_color_scheme (screen); + + if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) +@@ -809,6 +811,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA fg, bg, bold, theme_fg, theme_bg; + GdkRGBA *boldp; + GtkStyleContext *context; ++ GtkWidget *toplevel; ++ gboolean transparent; + + context = gtk_widget_get_style_context (widget); + gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg); +@@ -829,9 +833,25 @@ update_color_scheme (TerminalScreen *screen) + boldp = NULL; + + colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (transparent) ++ { ++ gint transparency_percent; ++ ++ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); ++ bg.alpha = (100 - transparency_percent) / 100.0; ++ } ++ else ++ bg.alpha = 1.0; ++ + vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, + colors, n_colors); + vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ gtk_widget_set_app_paintable (toplevel, transparent); + } + + static void +diff --git a/src/terminal-window.c b/src/terminal-window.c +index ce85744..98acab4 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window) + TerminalWindowPrivate *priv; + TerminalApp *app; + TerminalSettingsList *profiles_list; ++ GdkScreen *screen; ++ GdkVisual *visual; + GtkActionGroup *action_group; + GtkAction *action; + GtkUIManager *manager; +@@ -2564,6 +2566,11 @@ terminal_window_init (TerminalWindow *window) + + gtk_widget_init_template (GTK_WIDGET (window)); + ++ screen = gtk_widget_get_screen (GTK_WIDGET (window)); ++ visual = gdk_screen_get_rgba_visual (screen); ++ if (visual != NULL) ++ gtk_widget_set_visual (GTK_WIDGET (window), visual); ++ + uuid_generate (u); + uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); +-- +1.9.3 + + +From df5793813d19dccfb6dfa75c1be766df562adb48 Mon Sep 17 00:00:00 2001 +From: Lars Uebernickel +Date: Wed, 28 May 2014 14:11:02 +0200 +Subject: [PATCH 2/2] window: Make the drawing robust across all themes + +There are lots of themes out there in the wild that do not specify a +background-color for all widgets and the default is transparent. This +is usually not a problem because GTK+ sets an opaque region on the +whole window and things without a background-color get drawn with the +theme's default background colour. However, to achieve transparency +we disable the opaque region by making the window app-paintable. This +can lead to transparent menubars or notebook tabs in some themes. We +can avoid this by ensuring that the window always renders a background. + +https://bugzilla.gnome.org/show_bug.cgi?id=730016 +--- + src/terminal-window.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 98acab4..b838424 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2189,6 +2189,26 @@ terminal_window_realize (GtkWidget *widget) + } + + static gboolean ++terminal_window_draw (GtkWidget *widget, ++ cairo_t *cr) ++{ ++ if (gtk_widget_get_app_paintable (widget)) ++ { ++ GtkStyleContext *context; ++ int width; ++ int height; ++ ++ context = gtk_widget_get_style_context (widget); ++ width = gtk_widget_get_allocated_width (widget); ++ height = gtk_widget_get_allocated_height (widget); ++ gtk_render_background (context, cr, 0, 0, width, height); ++ gtk_render_frame (context, cr, 0, 0, width, height); ++ } ++ ++ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); ++} ++ ++static gboolean + terminal_window_state_event (GtkWidget *widget, + GdkEventWindowState *event) + { +@@ -2748,6 +2768,7 @@ terminal_window_class_init (TerminalWindowClass *klass) + + widget_class->show = terminal_window_show; + widget_class->realize = terminal_window_realize; ++ widget_class->draw = terminal_window_draw; + widget_class->window_state_event = terminal_window_state_event; + widget_class->screen_changed = terminal_window_screen_changed; + widget_class->style_updated = terminal_window_style_updated; +-- +1.9.3 + diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch new file mode 100644 index 0000000..1e3ddd3 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch @@ -0,0 +1,166 @@ +From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001 +From: Christian Persch +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 + diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild new file mode 100644 index 0000000..09d8d02 --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild @@ -0,0 +1,80 @@ +# 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.3 2015/03/15 13:34:24 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="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 +DEPEND="${RDEPEND} + app-text/yelp-tools + dev-util/appdata-tools + dev-util/gdbus-codegen + || ( 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() { + # 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}/${P}-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) + # 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 +}