From 57cb97545f62d9ca7ff722d83ddfdd2aa8da0656 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Tue, 25 Oct 2016 00:17:54 +0200 Subject: =?UTF-8?q?x11-terms/gnome-terminal:=20version=20bump=203.20.2=20?= =?UTF-8?q?=E2=86=92=203.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.3.2 --- x11-terms/gnome-terminal/Manifest | 1 + .../files/gnome-terminal-3.22.0-transparency.patch | 463 +++++++++++++++++++++ .../gnome-terminal/gnome-terminal-3.22.0.ebuild | 74 ++++ 3 files changed, 538 insertions(+) create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch create mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.22.0.ebuild (limited to 'x11-terms') diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 02ccfcb75d9e..986eaeb7252b 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -2,3 +2,4 @@ DIST gnome-terminal-3.16.2.tar.xz 1798620 SHA256 9df7bab7bfd15ca9a3c60612e425baa DIST gnome-terminal-3.18.2.tar.xz 1836144 SHA256 5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa SHA512 9fb3e15d90990e1c066a71a34657845a3a3531dcda928f5a61477528df3bd65125fcf28dfd278535e844ebf57fae738451cb5e6f0118bb75bedb98e92624ad41 WHIRLPOOL b8bfc15e37d7bc959057d0beff227f4724f046d3777f4e9111fae469891e37dce8bb6c296191822f55458b06b62dd84ba213b6345ff189861b0ddeddf2b3d14f DIST gnome-terminal-3.18.3.tar.xz 1845452 SHA256 14c2fce1c6a80a3fb0cc8666d7752228adcb60d199634ab69150de32e3c17d56 SHA512 3375038f69f3dbe2dee49c0835dd7ed8bd787e5a9ca59a905b737d6482d9a0ba27e4d98558b37bcb5561d143dfa8bed5613d4f9a46ae3a420e5a80803a88f756 WHIRLPOOL 04e0fdc12d18b14cfe41c50a43ca2a1d2107be2d23b17fc88189964e002b24ce812c0ec0a247c6eb8ade4bef89e537f475e7a318b26e4cbcb0f89a0fab4bdf52 DIST gnome-terminal-3.20.2.tar.xz 1897148 SHA256 f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23 SHA512 fe56d5a72580830232880b8e1752b5b268cf559ec9c031382b3631af4b9f2f1b7f661cc22df2643e0d50e66f8595a625e000f6068b16b8c5c9b6e9256a1db79a WHIRLPOOL 4909f016d75ff74705b6d3c92f1f7f3dbfad09ed6172895b1ca3eb455940c57c181a001907cccf78997e49509eb0dd90c7a640e2a3aeeff662ca1fee207f80d1 +DIST gnome-terminal-3.22.0.tar.xz 1931164 SHA256 97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed SHA512 71cdac0cec2fdcb43519aad6067c009a122e187fb4bf146cea90a3146338fd3b443aa27a7110c2a66324aa2239fe1c5e3326ad312be840369dbea066a2a2c93a WHIRLPOOL 5d4f95141230facf07870fce6b0a5d564b38b25555ef6f1f84b19ea480a4947db1f670bb844d271bfd0bdb329a255b71cddd60f8e64eec2f899452b3e2b3ff27 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch new file mode 100644 index 000000000000..981fc6d13197 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch @@ -0,0 +1,463 @@ +From 000785a2194012702c5245b0ac69b0003371bcdd Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 12 May 2014 14:57:18 +0200 +Subject: [PATCH 1/3] 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. + +The transparency checkbox lost its mnemonic accelerator because 't' +is already taken and using any other letter would make it hard to +restore the translations of the string. +--- + 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 c031c8a..7bdd156 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -370,6 +370,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 002561d..1a758a9 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1215,7 +1215,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 5adcb53..b7decb2 100644 +--- a/src/profile-preferences.ui ++++ b/src/profile-preferences.ui +@@ -23,6 +23,11 @@ + 1 + 100 + ++ ++ 100 ++ 1 ++ 10 ++ + + + +@@ -1036,6 +1041,93 @@ + 1 + + ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Transparent 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 4b734a3..e434075 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -69,6 +69,9 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" + #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" + ++#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_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 9a0b450..eab0cec 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -827,7 +827,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_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)) +@@ -897,6 +899,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; + GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; + GtkStyleContext *context; ++ GtkWidget *toplevel; ++ gboolean transparent; + gboolean use_theme_colors; + + context = gtk_widget_get_style_context (widget); +@@ -938,6 +942,18 @@ update_color_scheme (TerminalScreen *screen) + } + + 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); +@@ -945,6 +961,10 @@ update_color_scheme (TerminalScreen *screen) + vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); + vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); + vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); ++ ++ 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 a290d9f..020c6f0 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2621,6 +2621,8 @@ terminal_window_init (TerminalWindow *window) + TerminalWindowPrivate *priv; + TerminalApp *app; + TerminalSettingsList *profiles_list; ++ GdkScreen *screen; ++ GdkVisual *visual; + GSettings *gtk_debug_settings; + GtkActionGroup *action_group; + GtkAction *action; +@@ -2637,6 +2639,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); +-- +2.10.0 + + +From 9be09f1e055ae7aa2589ec94add5e994260929e3 Mon Sep 17 00:00:00 2001 +From: Lars Uebernickel +Date: Wed, 28 May 2014 14:11:02 +0200 +Subject: [PATCH 2/3] 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 020c6f0..a9f3ff7 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2295,6 +2295,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) + { +@@ -2832,6 +2852,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; +-- +2.10.0 + + +From 682a729942c07c375fbc075484bc49f188be40cd Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" +Date: Fri, 13 Nov 2015 15:16:42 +0100 +Subject: [PATCH 3/3] screen, window: Extra padding around transparent + terminals in Wayland + +https://bugzilla.redhat.com/show_bug.cgi?id=1207943 +--- + src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++--- + src/terminal-window.c | 18 ++++++++++++------ + 2 files changed, 49 insertions(+), 9 deletions(-) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index eab0cec..5d321a7 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -137,6 +137,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, + static gboolean terminal_screen_popup_menu (GtkWidget *widget); + static gboolean terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event); ++static void terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel); + static gboolean terminal_screen_do_exec (TerminalScreen *screen, + FDSetupData *data, + GError **error); +@@ -482,6 +484,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) + widget_class->drag_data_received = terminal_screen_drag_data_received; + widget_class->button_press_event = terminal_screen_button_press; + widget_class->popup_menu = terminal_screen_popup_menu; ++ widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; + + terminal_class->child_exited = terminal_screen_child_exited; + +@@ -885,6 +888,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, + } + + static void ++update_toplevel_transparency (TerminalScreen *screen) ++{ ++ GtkWidget *widget = GTK_WIDGET (screen); ++ TerminalScreenPrivate *priv = screen->priv; ++ GSettings *profile = priv->profile; ++ GtkWidget *toplevel; ++ ++ toplevel = gtk_widget_get_toplevel (widget); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ { ++ gboolean transparent; ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (gtk_widget_get_app_paintable (toplevel) != transparent) ++ { ++ gtk_widget_set_app_paintable (toplevel, transparent); ++ ++ /* The opaque region of the toplevel isn't updated until the toplevel is allocated; ++ * set_app_paintable() doesn't force an allocation, so do that manually. ++ */ ++ gtk_widget_queue_resize (toplevel); ++ } ++ } ++} ++ ++static void + update_color_scheme (TerminalScreen *screen) + { + GtkWidget *widget = GTK_WIDGET (screen); +@@ -962,9 +991,7 @@ update_color_scheme (TerminalScreen *screen) + vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); + vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); + +- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); +- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) +- gtk_widget_set_app_paintable (toplevel, transparent); ++ update_toplevel_transparency (screen); + } + + static void +@@ -1567,6 +1594,13 @@ terminal_screen_do_popup (TerminalScreen *screen, + terminal_screen_popup_info_unref (info); + } + ++static void ++terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel) ++{ ++ update_toplevel_transparency (TERMINAL_SCREEN (widget)); ++} ++ + static gboolean + terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event) +diff --git a/src/terminal-window.c b/src/terminal-window.c +index a9f3ff7..d09484e 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2300,15 +2300,21 @@ terminal_window_draw (GtkWidget *widget, + { + if (gtk_widget_get_app_paintable (widget)) + { ++ GtkAllocation child_allocation; + GtkStyleContext *context; +- int width; +- int height; ++ GtkWidget *child; ++ ++ /* Get the *child* allocation, so we don't overwrite window borders */ ++ child = gtk_bin_get_child (GTK_BIN (widget)); ++ gtk_widget_get_allocation (child, &child_allocation); + + 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); ++ gtk_render_background (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); ++ gtk_render_frame (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); + } + + return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); +-- +2.10.0 + diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.22.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.22.0.ebuild new file mode 100644 index 000000000000..edefd389217a --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-3.22.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +GNOME2_LA_PUNT="yes" + +inherit autotools gnome2 readme.gentoo-r1 + +DESCRIPTION="The Gnome Terminal" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="debug +gnome-shell +nautilus vanilla" +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], just transitive but needs proper control +RDEPEND=" + >=dev-libs/glib-2.42:2[dbus] + >=x11-libs/gtk+-3.20:3[X] + >=x11-libs/vte-0.46.0:2.91 + >=dev-libs/libpcre2-10 + >=gnome-base/dconf-0.14 + >=gnome-base/gsettings-desktop-schemas-0.1.0 + sys-apps/util-linux + gnome-shell? ( gnome-base/gnome-shell ) + nautilus? ( >=gnome-base/nautilus-3 ) +" +# 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/gdbus-codegen + >=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() { + if ! use vanilla; then + # OpenSuSE patches, https://bugzilla.gnome.org/show_bug.cgi?id=695371 + # http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/tree/gnome-terminal-transparency-notify.patch (first 3 parts) + eapply "${FILESDIR}"/${PN}-3.22.0-transparency.patch + eautoreconf + fi + 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 +} -- cgit v1.2.3