* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
@ 2016-06-28 4:57 Alexandre Rostovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Rostovtsev @ 2016-06-28 4:57 UTC (permalink / raw
To: gentoo-commits
commit: d5f44d5cbee76147bb07d4e4ea999e7cb0cc1291
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 04:55:38 2016 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 04:56:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f44d5c
x11-terms/gnome-terminal: bump to 3.20.2 for gnome-3.20
Support for dark themes has been restored upstream!
Edit → Preferences → General → Theme variant = Dark
Package-Manager: portage-2.3.0
x11-terms/gnome-terminal/Manifest | 1 +
.../files/gnome-terminal-3.20.2-transparency.patch | 463 +++++++++++++++++++++
.../gnome-terminal/gnome-terminal-3.20.2.ebuild | 77 ++++
3 files changed, 541 insertions(+)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 08aee67..02ccfcb 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,3 +1,4 @@
DIST gnome-terminal-3.16.2.tar.xz 1798620 SHA256 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0 SHA512 06327569de64ec9d1a045ea191edaabfe80e62dc55b5b8722d36e9d419f8d0cdfda29503f4aec68ae61798d77269ad902864eee8609369da31315368a9ab254f WHIRLPOOL 559833e2080c784080e001260a732fa480f187d17a8d1d069253175b9afd053d4fbd1d7a557442c467b915d31432e50bb4f0f9a94699fb3ed95810fb5f32b56e
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
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.20.2-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.20.2-transparency.patch
new file mode 100644
index 0000000..0144c06
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.20.2-transparency.patch
@@ -0,0 +1,463 @@
+From 9ef3a75e6dcc347c023cf9c927383596912a7f2c Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 12 May 2014 14:57:18 +0200
+Subject: [PATCH 1/6] 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 c031c8ace24a..7bdd156e36aa 100644
+--- a/src/org.gnome.Terminal.gschema.xml
++++ b/src/org.gnome.Terminal.gschema.xml
+@@ -370,6 +370,16 @@
+ <default>'narrow'</default>
+ <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
+ </key>
++ <key name="use-transparent-background" type="b">
++ <default>false</default>
++ <summary>Whether to use a transparent background</summary>
++ </key>
++ <key name="background-transparency-percent" type="i">
++ <default>50</default>
++ <range min="0" max="100"/>
++ <summary>Adjust the amount of transparency</summary>
++ <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
++ </key>
+ </schema>
+
+ <!-- Keybinding settings -->
+diff --git a/src/profile-editor.c b/src/profile-editor.c
+index ff26df6a0e1b..b8c1c784d17e 100644
+--- a/src/profile-editor.c
++++ b/src/profile-editor.c
+@@ -1218,7 +1218,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 9c0094687ffd..9caf72da0f14 100644
+--- a/src/profile-preferences.ui
++++ b/src/profile-preferences.ui
+@@ -23,6 +23,11 @@
+ <property name="step_increment">1</property>
+ <property name="page_increment">100</property>
+ </object>
++ <object class="GtkAdjustment" id="background-transparent-adjustment">
++ <property name="upper">100</property>
++ <property name="step_increment">1</property>
++ <property name="page_increment">10</property>
++ </object>
+ <object class="GtkListStore" id="cjk-ambiguous-width-model">
+ <columns>
+ <!-- column-name gchararray -->
+@@ -1035,6 +1040,93 @@
+ <property name="position">1</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkBox" id="use-transparent-background-box">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">horizontal</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkCheckButton" id="use-transparent-background">
++ <property name="label" translatable="yes">Transparent background</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="use_underline">True</property>
++ <property name="xalign">0</property>
++ <property name="draw_indicator">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox" id="background-transparent-scale-box">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">horizontal</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkLabel" id="background-transparent-min-label">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="xalign">0.5</property>
++ <property name="label" translatable="yes">none</property>
++ <style>
++ <class name="dim-label"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkScale" id="background-transparent-scale">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="adjustment">background-transparent-adjustment</property>
++ <property name="draw_value">False</property>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="background-transparent-max-label">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="xalign">0.5</property>
++ <property name="label" translatable="yes">full</property>
++ <style>
++ <class name="dim-label"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
+ </object>
+ </child>
+ </object>
+diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
+index 4b734a3961d1..e434075d86af 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 33a34abc2f93..92e8bb387d03 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -855,7 +855,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))
+@@ -925,6 +927,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);
+@@ -966,6 +970,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);
+@@ -973,6 +989,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 80e54b002819..0642ccecda30 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2618,6 +2618,8 @@ terminal_window_init (TerminalWindow *window)
+ TerminalWindowPrivate *priv;
+ TerminalApp *app;
+ TerminalSettingsList *profiles_list;
++ GdkScreen *screen;
++ GdkVisual *visual;
+ GtkActionGroup *action_group;
+ GtkAction *action;
+ GtkUIManager *manager;
+@@ -2632,6 +2634,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.5.0
+
+
+From 0bdf26225511bac8d00c08477dee431f04763330 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <lars.uebernickel@canonical.com>
+Date: Wed, 28 May 2014 14:11:02 +0200
+Subject: [PATCH 2/6] 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 0642ccecda30..1616689b3765 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2290,6 +2290,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)
+ {
+@@ -2818,6 +2838,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.5.0
+
+
+From 8ecbda047d7c15bd6b387e9b7128e688708303e7 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
+Date: Fri, 13 Nov 2015 15:16:42 +0100
+Subject: [PATCH 3/6] 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 92e8bb387d03..1718d42edaa8 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -140,6 +140,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);
+@@ -510,6 +512,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;
+
+@@ -913,6 +916,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);
+@@ -990,9 +1019,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
+@@ -1595,6 +1622,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 1616689b3765..353647903af0 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2295,15 +2295,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.5.0
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
new file mode 100644
index 0000000..8318e2b
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
@@ -0,0 +1,77 @@
+# 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 eutils 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]
+RDEPEND="
+ >=dev-libs/glib-2.42:2[dbus]
+ >=x11-libs/gtk+-3.12:3[X]
+ >=x11-libs/vte-0.44.2: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 )
+"
+# 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/desktop-file-utils
+ dev-util/gdbus-codegen
+ 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() {
+ 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.20.2-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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
@ 2022-01-25 0:49 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-25 0:49 UTC (permalink / raw
To: gentoo-commits
commit: 485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon Jan 24 20:09:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:49:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485a8aaf
x11-term/gnome-terminal: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831940
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/3.42.2-fix-build-with-meson-0.61.1.patch | 39 ++++++++++++++++++++++
.../gnome-terminal/gnome-terminal-3.42.2.ebuild | 6 +++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..e0e9d39204f2
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,39 @@
+https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403
+https://bugs.gentoo.org/831940
+
+From: Christian Persch <chpe@src.gnome.org>
+Date: Fri, 14 Jan 2022 11:33:32 +0100
+Subject: [PATCH] build: Fix for newer meson
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gt_datadir / 'metainfo'
+
+ i18n.merge_file(
+- gt_dns_name + '.metainfo.xml',
+ input: gt_dns_name + '.metainfo.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+@@ -27,7 +26,6 @@ i18n.merge_file(
+ )
+
+ i18n.merge_file(
+- gt_dns_name + '.Nautilus.metainfo.xml',
+ input: gt_dns_name + '.Nautilus.metainfo.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+@@ -40,7 +38,6 @@ i18n.merge_file(
+ desktopdatadir = gt_datadir / 'applications'
+
+ i18n.merge_file(
+- gt_dns_name + '.desktop',
+ input: gt_dns_name + '.desktop.in',
+ output: '@BASENAME@',
+ type: 'desktop',
+@@ -57,4 +54,4 @@ meson.add_install_script(
+
+ # Subdirs
+
+-subdir('icons')
+\ No newline at end of file
++subdir('icons')
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
index 066ebe755cd7..f47df2f66e01 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
notifications of long-running commands finishing, you will need
to add the following line to your ~/.bashrc:\n
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
@ 2022-05-31 18:24 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-05-31 18:24 UTC (permalink / raw
To: gentoo-commits
commit: bb089166482ed4980b369db67a5ad8c219df7e4b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 17:49:49 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 31 18:23:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb089166
x11-terms/gnome-terminal: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-terms/gnome-terminal/Manifest | 2 -
.../files/3.42.2-fix-build-with-meson-0.61.1.patch | 39 ---------
.../gnome-terminal/gnome-terminal-3.42.2.ebuild | 96 ----------------------
3 files changed, 137 deletions(-)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 848190518745..2199c60f8d38 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71 SHA512 4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210
-DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6
DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index e0e9d39204f2..000000000000
--- a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403
-https://bugs.gentoo.org/831940
-
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 14 Jan 2022 11:33:32 +0100
-Subject: [PATCH] build: Fix for newer meson
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = gt_datadir / 'metainfo'
-
- i18n.merge_file(
-- gt_dns_name + '.metainfo.xml',
- input: gt_dns_name + '.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -27,7 +26,6 @@ i18n.merge_file(
- )
-
- i18n.merge_file(
-- gt_dns_name + '.Nautilus.metainfo.xml',
- input: gt_dns_name + '.Nautilus.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -40,7 +38,6 @@ i18n.merge_file(
- desktopdatadir = gt_datadir / 'applications'
-
- i18n.merge_file(
-- gt_dns_name + '.desktop',
- input: gt_dns_name + '.desktop.in',
- output: '@BASENAME@',
- type: 'desktop',
-@@ -57,4 +54,4 @@ meson.add_install_script(
-
- # Subdirs
-
--subdir('icons')
-\ No newline at end of file
-+subdir('icons')
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
deleted file mode 100644
index 2dc8e8704803..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="A terminal emulator for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch.xz )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
- >=dev-libs/glib-2.52:2
- >=x11-libs/gtk+-3.22.27:3
- >=x11-libs/vte-0.64.0:2.91[!vanilla?]
- >=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.28.0 )
-"
-DEPEND="${RDEPEND}"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-BDEPEND="
- dev-libs/libxml2:2
- dev-libs/libxslt
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
- notifications of long-running commands finishing, you will need
- to add the following line to your ~/.bashrc:\n
- . /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
- if ! use vanilla; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=695371
- # Fedora patches:
- # Restore transparency support (with compositing WMs only)
- # OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
- # Restore "Set title" support
- # Automatic title updating based on currently running foreground process
- # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
- # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
- eapply "${WORKDIR}"/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch
- fi
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use debug dbg)
- -Ddocs=false
- $(meson_use nautilus nautilus_extension)
- $(meson_use gnome-shell search_provider)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- if ! use vanilla; then
- # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
- insinto /usr/share/glib-2.0/schemas
- newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
- fi
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-31 18:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 0:49 [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-31 18:24 Matt Turner
2016-06-28 4:57 Alexandre Rostovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox