* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/
@ 2016-10-26 7:03 Gilles Dartiguelongue
0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-26 7:03 UTC (permalink / raw
To: gentoo-commits
commit: 6e3716a9170c75a91ac8039e2bf3f9d43027b2da
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 22:19:23 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 07:03:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3716a9
x11-terms/gnome-terminal: cleanup old revisions
Package-Manager: portage-2.3.2
x11-terms/gnome-terminal/Manifest | 3 -
.../files/gnome-terminal-3.16.2-restore-dark.patch | 196 ---
...nome-terminal-3.16.2-restore-transparency.patch | 1604 --------------------
.../files/gnome-terminal-3.18.2-dark-theme.patch | 176 ---
...3.18.2-transparency-fix-for-broken-themes.patch | 62 -
.../files/gnome-terminal-3.18.2-transparency.patch | 263 ----
.../gnome-terminal/gnome-terminal-3.16.2-r2.ebuild | 78 -
.../gnome-terminal/gnome-terminal-3.18.2.ebuild | 79 -
.../gnome-terminal/gnome-terminal-3.18.3.ebuild | 79 -
9 files changed, 2540 deletions(-)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 986eaeb..45e63c5 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,2 @@
-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
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.16.2-restore-dark.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
deleted file mode 100644
index 0b98c35..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 17 Feb 2015 13:22:11 +0100
-Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref"
-
-This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
----
- src/org.gnome.Terminal.gschema.xml | 5 +++++
- src/preferences.ui | 16 ++++++++++++++++
- src/terminal-app.c | 4 ++++
- src/terminal-prefs.c | 9 ++++++++-
- src/terminal-schemas.h | 1 +
- 5 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index 051bdc4..95c5405 100644
---- a/src/org.gnome.Terminal.gschema.xml
-+++ b/src/org.gnome.Terminal.gschema.xml
-@@ -656,6 +656,11 @@
- <summary>Whether to show the menubar in new windows</summary>
- </key>
-
-+ <key name="dark-theme" type="b">
-+ <default>false</default>
-+ <summary>Whether to use a dark theme variant</summary>
-+ </key>
-+
- <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
- <default>'window'</default>
- <summary>Whether to open new terminals as windows or tabs</summary>
-diff --git a/src/preferences.ui b/src/preferences.ui
-index f64a11b..df82508 100644
---- a/src/preferences.ui
-+++ b/src/preferences.ui
-@@ -139,6 +139,22 @@
- </packing>
- </child>
- <child>
-+ <object class="GtkCheckButton" id="dark-theme-checkbutton">
-+ <property name="label" translatable="yes">Use _dark theme variant</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">True</property>
-+ <property name="position">3</property>
-+ </packing>
-+ </child>
-+ <child>
- <object class="GtkBox" id="hbox140">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
-diff --git a/src/terminal-app.c b/src/terminal-app.c
-index 8a9434f..95302c5 100644
---- a/src/terminal-app.c
-+++ b/src/terminal-app.c
-@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app)
-
- /* Terminal global settings */
- app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
-+ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
-+ gtk_settings_get_default (),
-+ "gtk-application-prefer-dark-theme",
-+ G_SETTINGS_BIND_GET);
-
- /* Check if we need to migrate from gconf to dconf */
- maybe_migrate_settings (app);
-diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
-index 97f6c33..a57dde6 100644
---- a/src/terminal-prefs.c
-+++ b/src/terminal-prefs.c
-@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
- GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
- GtkWidget *disable_shortcuts_button;
- GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
-- GtkWidget *new_terminal_mode_combo;
-+ GtkWidget *dark_theme_button, *new_terminal_mode_combo;
- GtkWidget *default_hbox, *default_label;
- GtkTreeSelection *selection;
- GSettings *settings;
-@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
- "preferences-dialog",
- "preferences-dialog", &dialog,
- "default-show-menubar-checkbutton", &show_menubar_button,
-+ "dark-theme-checkbutton", &dark_theme_button,
- "new-terminal-mode-combobox", &new_terminal_mode_combo,
- "disable-mnemonics-checkbutton", &disable_mnemonics_button,
- "disable-shortcuts-checkbutton", &disable_shortcuts_button,
-@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-
- g_settings_bind (settings,
-+ TERMINAL_SETTING_DARK_THEME_KEY,
-+ dark_theme_button,
-+ "active",
-+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-+
-+ g_settings_bind (settings,
- TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
- new_terminal_mode_combo,
- "active-id",
-diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
-index 0fcbf52..c6acd7c 100644
---- a/src/terminal-schemas.h
-+++ b/src/terminal-schemas.h
-@@ -69,6 +69,7 @@ G_BEGIN_DECLS
-
- #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"
- #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
- #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled"
- #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled"
---
-2.1.0
-
-
-From 9fc68b087180e48cb4e2275f3134f66f2c43de14 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 17 Feb 2015 13:22:21 +0100
-Subject: [PATCH 2/2] Revert "help: Remove dark theme pref"
-
-This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b.
----
- help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++
- help/Makefile.am | 1 +
- 2 files changed, 42 insertions(+)
- create mode 100644 help/C/pref-theme.page
-
-diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page
-new file mode 100644
-index 0000000..a997d14
---- /dev/null
-+++ b/help/C/pref-theme.page
-@@ -0,0 +1,41 @@
-+<page xmlns="http://projectmallard.org/1.0/"
-+ xmlns:its="http://www.w3.org/2005/11/its"
-+ type="guide"
-+ id="pref-theme">
-+
-+ <info>
-+ <link type="guide" xref="index#appearance"/>
-+ <revision pkgversion="3.12" date="2014-02-26" status="review"/>
-+
-+ <credit type="author copyright">
-+ <name>Ekaterina Gerasimova</name>
-+ <email its:translate="no">kittykat3756@gmail.com</email>
-+ <years>2014</years>
-+ </credit>
-+ <!--<credit type="copyright editor">
-+ <name></name>
-+ <email its:translate="no"></email>
-+ <years></years>
-+ </credit>-->
-+
-+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-+ <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
-+ </info>
-+
-+ <title>Chose the window theme</title>
-+
-+ <p>You can chose to use either the dark theme or the light theme for the
-+ terminal window.</p>
-+
-+ <steps>
-+ <item>
-+ <p>Select
-+ <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
-+ </item>
-+ <item>
-+ <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
-+ </item>
-+ </steps>
-+
-+</page>
-diff --git a/help/Makefile.am b/help/Makefile.am
-index 33389c5..9c02a74 100644
---- a/help/Makefile.am
-+++ b/help/Makefile.am
-@@ -35,6 +35,7 @@ HELP_FILES = \
- pref-profile-encoding.page \
- pref-scrolling.page \
- pref-tab-window.page \
-+ pref-theme.page \
- pref-user-input.page \
- profile.page \
- prob-reset.page \
---
-2.1.0
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch
deleted file mode 100644
index 56bebcd..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch
+++ /dev/null
@@ -1,1604 +0,0 @@
-From 181dca2c0b50af1326a84e1ec0134afab88ff5b2 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/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 0f8433f..104e662 100644
---- a/src/org.gnome.Terminal.gschema.xml
-+++ b/src/org.gnome.Terminal.gschema.xml
-@@ -333,6 +333,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 3e8ccaf..f09b6bc 100644
---- a/src/profile-editor.c
-+++ b/src/profile-editor.c
-@@ -1106,7 +1106,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 eb2fa26..7f8a471 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="model1">
- <columns>
- <!-- column-name gchararray -->
-@@ -1045,6 +1050,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 17ffdb2..0fcbf52 100644
---- a/src/terminal-schemas.h
-+++ b/src/terminal-schemas.h
-@@ -64,6 +64,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 df3fdde..48174c2 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))
-@@ -816,6 +818,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);
-@@ -836,9 +840,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 12cae4f..366e4f8 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);
---
-2.1.0
-
-
-From de7d64698ac700f63898221a5815af939001ba18 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/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 366e4f8..2458656 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)
- {
-@@ -2753,6 +2773,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.1.0
-
-
-From dfc31fb0803d546cc21ef8bcd33e54c30e14dc1c Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 17 Feb 2015 17:06:17 +0100
-Subject: [PATCH 3/3] Restore translations for transparency
-
----
- po/am.po | 4 ++--
- po/ar.po | 4 ++--
- po/as.po | 4 ++--
- po/ast.po | 4 ++--
- po/az.po | 4 ++--
- po/be.po | 3 +++
- po/be@latin.po | 4 ++--
- po/bg.po | 3 +++
- po/bn_IN.po | 3 +++
- po/bs.po | 4 ++++
- po/ca.po | 3 +++
- po/ca@valencia.po | 3 +++
- po/cs.po | 3 +++
- po/cy.po | 4 ++--
- po/da.po | 4 ++--
- po/de.po | 4 ++--
- po/dz.po | 4 ++--
- po/el.po | 3 +++
- po/en@shaw.po | 4 ++--
- po/en_CA.po | 4 ++--
- po/en_GB.po | 4 ++--
- po/es.po | 4 ++--
- po/et.po | 3 +++
- po/eu.po | 4 ++--
- po/fa.po | 3 +++
- po/fi.po | 5 ++++-
- po/fr.po | 3 +++
- po/fur.po | 4 ++--
- po/ga.po | 3 +++
- po/gl.po | 4 ++--
- po/gu.po | 4 ++--
- po/he.po | 4 ++--
- po/hi.po | 4 ++--
- po/hr.po | 4 ++--
- po/hu.po | 3 +++
- po/hy.po | 4 ++--
- po/id.po | 3 +++
- po/it.po | 3 +++
- po/ja.po | 3 +++
- po/ka.po | 2 +-
- po/kk.po | 3 +++
- po/kn.po | 3 +++
- po/ko.po | 3 +++
- po/ku.po | 4 ++--
- po/lt.po | 3 +++
- po/lv.po | 4 ++--
- po/mai.po | 4 ++--
- po/mg.po | 4 ++--
- po/mk.po | 4 ++--
- po/ml.po | 4 ++--
- po/mn.po | 4 ++--
- po/mr.po | 4 ++--
- po/ms.po | 4 ++--
- po/nb.po | 3 +++
- po/nds.po | 4 ++--
- po/ne.po | 4 ++--
- po/nl.po | 3 +++
- po/nn.po | 4 ++--
- po/oc.po | 4 ++--
- po/or.po | 4 ++--
- po/pa.po | 4 ++--
- po/pl.po | 3 +++
- po/ps.po | 4 ++--
- po/pt.po | 4 ++--
- po/pt_BR.po | 3 +++
- po/ro.po | 4 ++--
- po/ru.po | 3 +++
- po/rw.po | 2 +-
- po/si.po | 4 ++--
- po/sk.po | 3 +++
- po/sl.po | 3 +++
- po/sq.po | 4 ++--
- po/sr.po | 3 +++
- po/sr@latin.po | 3 +++
- po/sv.po | 3 +++
- po/ta.po | 4 ++--
- po/te.po | 4 ++--
- po/th.po | 4 ++--
- po/tr.po | 3 +++
- po/ug.po | 4 ++--
- po/uk.po | 4 ++--
- po/vi.po | 3 +++
- po/wa.po | 4 ++--
- po/xh.po | 4 ++--
- po/zh_CN.po | 3 +++
- po/zh_HK.po | 3 +++
- po/zh_TW.po | 3 +++
- 87 files changed, 210 insertions(+), 101 deletions(-)
-
-diff --git a/po/am.po b/po/am.po
-index 27a7e96..04a8ad9 100644
---- a/po/am.po
-+++ b/po/am.po
-@@ -613,8 +613,8 @@ msgid "_Text color:"
- msgstr "የ_ጽሑፍ ቀለም፦"
-
- #: ../src/gnome-terminal.glade2.h:102
--msgid "_Transparent background"
--msgstr "_የሚያሳይ መደብ"
-+msgid "Transparent background"
-+msgstr "የሚያሳይ መደብ"
-
- #: ../src/gnome-terminal.glade2.h:103
- msgid "_Update login records when command is launched"
-diff --git a/po/ar.po b/po/ar.po
-index c27cd9c..f541938 100644
---- a/po/ar.po
-+++ b/po/ar.po
-@@ -2914,8 +2914,8 @@ msgstr "أغ_لق النافذة"
- #~ msgid "Background image _scrolls"
- #~ msgstr "صورة الخلفية ت_لتف"
-
--#~ msgid "_Transparent background"
--#~ msgstr "خلفية _شفافة"
-+msgid "Transparent background"
-+msgstr "خلفية شفافة"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "_ظلل شفافية أو صورة الخلفية:"
-diff --git a/po/as.po b/po/as.po
-index 0bd699d..63fca01 100644
---- a/po/as.po
-+++ b/po/as.po
-@@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)"
- #~ msgid "Background image _scrolls"
- #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "স্বচ্চ পটভূমি (_T)"
-+msgid "Transparent background"
-+msgstr "স্বচ্চ পটভূমি "
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):"
-diff --git a/po/ast.po b/po/ast.po
-index d1c6e7b..4210820 100644
---- a/po/ast.po
-+++ b/po/ast.po
-@@ -1598,8 +1598,8 @@ msgid "_Text color:"
- msgstr "Color del _testu:"
-
- #: ../src/profile-preferences.glade.h:77
--msgid "_Transparent background"
--msgstr "Fondu _tresparente"
-+msgid "Transparent background"
-+msgstr "Fondu tresparente"
-
- #: ../src/profile-preferences.glade.h:78
- msgid "_Underline color:"
-diff --git a/po/az.po b/po/az.po
-index b0f2e3e..877f114 100644
---- a/po/az.po
-+++ b/po/az.po
-@@ -619,8 +619,8 @@ msgid "_Text color:"
- msgstr "_Mətn rəngi:"
-
- #: ../src/gnome-terminal.glade2.h:102
--msgid "_Transparent background"
--msgstr "_Şəffaf arxa plan"
-+msgid "Transparent background"
-+msgstr "Şəffaf arxa plan"
-
- #: ../src/gnome-terminal.glade2.h:103
- msgid "_Update login records when command is launched"
-diff --git a/po/be.po b/po/be.po
-index fca0ae4..74ff329 100644
---- a/po/be.po
-+++ b/po/be.po
-@@ -2015,3 +2015,6 @@ msgstr ""
- msgid "C_lose Window"
- msgstr "_Закрыць акно"
-
-+msgid "Transparent background"
-+msgstr "Празрысты фон"
-+
-diff --git a/po/be@latin.po b/po/be@latin.po
-index 1e057c7..1d22a58 100644
---- a/po/be@latin.po
-+++ b/po/be@latin.po
-@@ -1425,8 +1425,8 @@ msgid "_Text color:"
- msgstr "Koler _tekstu:"
-
- #: ../src/profile-preferences.glade.h:73
--msgid "_Transparent background"
--msgstr "_Prazrysty fon"
-+msgid "Transparent background"
-+msgstr "Prazrysty fon"
-
- #: ../src/profile-preferences.glade.h:74
- msgid "_Update login records when command is launched"
-diff --git a/po/bg.po b/po/bg.po
-index 7e9c9be..241ef52 100644
---- a/po/bg.po
-+++ b/po/bg.po
-@@ -2100,3 +2100,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Затваряне на този прозорец"
-+
-+msgid "Transparent background"
-+msgstr "Прозрачен фон"
-diff --git a/po/bn_IN.po b/po/bn_IN.po
-index c74246a..d65b322 100644
---- a/po/bn_IN.po
-+++ b/po/bn_IN.po
-@@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
-
- #~ msgid "_Title:"
- #~ msgstr "শিরোনাম: (_T)"
-+
-+msgid "Transparent background"
-+msgstr "স্বচ্চ পটভূমি "
-diff --git a/po/bs.po b/po/bs.po
-index 49e7108..fccfa86 100644
---- a/po/bs.po
-+++ b/po/bs.po
-@@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta"
- msgid "Keyboard shortcut to make font smaller"
- msgstr "Kratica tastature za smanjivanje fonta"
-
-+#: ../src/gnome-terminal.glade2.h:102
-+msgid "Transparent background"
-+msgstr "Providna pozadina"
-+
- #: ../src/org.gnome.Terminal.gschema.xml.h:78
- msgid "Keyboard shortcut to make font normal-size"
- msgstr "Kratica tastature za postavljanje fonta na normalnu veličinu"
-diff --git a/po/ca.po b/po/ca.po
-index 567b344..156eed1 100644
---- a/po/ca.po
-+++ b/po/ca.po
-@@ -2111,3 +2111,6 @@ msgstr "Tanca la _finestra"
-
- #~ msgid "Use _dark theme variant"
- #~ msgstr "Utilitza la variant de tema _fosc"
-+
-+msgid "Transparent background"
-+msgstr "Fons transparent"
-diff --git a/po/ca@valencia.po b/po/ca@valencia.po
-index 1c279a0..4073f71 100644
---- a/po/ca@valencia.po
-+++ b/po/ca@valencia.po
-@@ -2092,3 +2092,6 @@ msgstr ""
- #: ../src/terminal-window.c:3645
- msgid "C_lose Window"
- msgstr "Tanca la _finestra"
-+
-+msgid "Transparent background"
-+msgstr "Fons transparent"
-diff --git a/po/cs.po b/po/cs.po
-index f1e8c44..912b4df 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -2063,3 +2063,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Zavřít okno"
-+
-+msgid "Transparent background"
-+msgstr "Průsvitné pozadí"
-diff --git a/po/cy.po b/po/cy.po
-index 06d0e3c..2491bd1 100644
---- a/po/cy.po
-+++ b/po/cy.po
-@@ -1447,8 +1447,8 @@ msgid "_Text color:"
- msgstr "Lliw'r _testun:"
-
- #: ../src/profile-preferences.glade.h:73
--msgid "_Transparent background"
--msgstr "Cefndir _tryloyw"
-+msgid "Transparent background"
-+msgstr "Cefndir tryloyw"
-
- #: ../src/profile-preferences.glade.h:74
- msgid "_Update login records when command is launched"
-diff --git a/po/da.po b/po/da.po
-index 74b7d0b..af69a6b 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -2987,8 +2987,8 @@ msgstr "_Luk vindue"
- #~ msgid "_Solid color"
- #~ msgstr "_Ensfarvet"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_Gennemsigtig baggrund"
-+msgid "Transparent background"
-+msgstr "Gennemsigtig baggrund"
-
- #~ msgid ""
- #~ "You already have a profile called “%s”. Do you want to create another "
-diff --git a/po/de.po b/po/de.po
-index 6b2bb19..2b814c0 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -3060,8 +3060,8 @@ msgstr "Fenster _schließen"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Hintergrundbild _folgt Bildlauf"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_Transparenter Hintergrund"
-+msgid "Transparent background"
-+msgstr "Transparenter Hintergrund"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:"
-diff --git a/po/dz.po b/po/dz.po
-index ecb8fd5..290934a 100644
---- a/po/dz.po
-+++ b/po/dz.po
-@@ -1551,8 +1551,8 @@ msgid "_Text color:"
- msgstr "ཚིག་ཡིག་ཚོས་གཞི་:(_T)"
-
- #: ../src/profile-preferences.glade.h:77
--msgid "_Transparent background"
--msgstr "དྭངས་གསལ་རྒྱབ་གཞི།(_T)"
-+msgid "Transparent background"
-+msgstr "དྭངས་གསལ་རྒྱབ་གཞི།"
-
- #: ../src/profile-preferences.glade.h:78
- #, fuzzy
-diff --git a/po/el.po b/po/el.po
-index b81802c..a32ae26 100644
---- a/po/el.po
-+++ b/po/el.po
-@@ -2289,3 +2289,6 @@ msgstr "Κ_λείσιμο παραθύρου"
-
- #~ msgid "_Input Methods"
- #~ msgstr "_Μέθοδοι εισαγωγής"
-+
-+msgid "Transparent background"
-+msgstr "Διάφανο παρασκήνιο"
-diff --git a/po/en@shaw.po b/po/en@shaw.po
-index 65f3d41..05dc99d 100644
---- a/po/en@shaw.po
-+++ b/po/en@shaw.po
-@@ -1467,8 +1467,8 @@ msgid "_Text color:"
- msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:"
-
- #: ../src/profile-preferences.glade.h:78
--msgid "_Transparent background"
--msgstr "_𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛"
-+msgid "Transparent background"
-+msgstr "𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛"
-
- #: ../src/profile-preferences.glade.h:79
- msgid "_Underline color:"
-diff --git a/po/en_CA.po b/po/en_CA.po
-index c79cbf5..b8b14d2 100644
---- a/po/en_CA.po
-+++ b/po/en_CA.po
-@@ -556,8 +556,8 @@ msgid "_Text color:"
- msgstr "_Text colour:"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "_Transparent background"
-+msgid "Transparent background"
-+msgstr "Transparent background"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/en_GB.po b/po/en_GB.po
-index 4d38486..69e7113 100644
---- a/po/en_GB.po
-+++ b/po/en_GB.po
-@@ -2732,8 +2732,8 @@ msgstr "_Title:"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Background image _scrolls"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_Transparent background"
-+msgid "Transparent background"
-+msgstr "Transparent background"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "S_hade transparent or image background:"
-diff --git a/po/es.po b/po/es.po
-index c8b47fe..4d33066 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -3095,8 +3095,8 @@ msgstr "_Cerrar ventana"
- #~ msgid "_Solid color"
- #~ msgstr "Color _sólido"
-
--#~ msgid "_Transparent background"
--#~ msgstr "Fondo _transparente"
-+msgid "Transparent background"
-+msgstr "Fondo transparente"
-
- #~ msgid "No such profile \"%s\", using default profile\n"
- #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n"
-diff --git a/po/et.po b/po/et.po
-index 4b1c2a7..7707611 100644
---- a/po/et.po
-+++ b/po/et.po
-@@ -1747,3 +1747,6 @@ msgstr "Su_lge aken"
-
- #~ msgid "Choose base profile"
- #~ msgstr "Vali põhiprofiil"
-+
-+msgid "Transparent background"
-+msgstr "Läbipaistev taust"
-diff --git a/po/eu.po b/po/eu.po
-index 97bb976..b53f33c 100644
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -2972,8 +2972,8 @@ msgstr "It_xi leihoa"
- #~ msgid "_Solid color"
- #~ msgstr "_Kolore solidoa"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_Atzeko plano gardena"
-+msgid "Transparent background"
-+msgstr "Atzeko plano gardena"
-
- #~ msgid ""
- #~ "You already have a profile called “%s”. Do you want to create another "
-diff --git a/po/fa.po b/po/fa.po
-index 2090863..b9a05af 100644
---- a/po/fa.po
-+++ b/po/fa.po
-@@ -2027,3 +2027,6 @@ msgstr "ذخیره به نام..."
- #: ../src/terminal-window.c:3456
- msgid "_Title:"
- msgstr "_عنوان:"
-+
-+msgid "Transparent background"
-+msgstr "پسزمینهی شفاف"
-diff --git a/po/fi.po b/po/fi.po
-index f80a962..dacd609 100644
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -2069,6 +2069,9 @@ msgstr ""
- msgid "C_lose Window"
- msgstr "_Sulje ikkuna"
-
-+msgid "Transparent background"
-+msgstr "Läpinäkyvä tausta"
-+
- #~ msgid "Set the terminal title"
- #~ msgstr "Aseta päätteen otsikko"
-
-@@ -2083,4 +2086,4 @@ msgstr "_Sulje ikkuna"
- #~ msgstr "Käytetäänkö teeman tummaan muunnelmaa"
-
- #~ msgid "Use _dark theme variant"
--#~ msgstr "Käytä _teeman tummaa muunnelmaa"
-+#~ msgstr "Käytä _teeman tummaa muunnelmaa"
-\ No newline at end of file
-diff --git a/po/fr.po b/po/fr.po
-index fd28f38..babd28d 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -2135,3 +2135,6 @@ msgstr "Fermer _la fenêtre"
-
- #~ msgid "Use _dark theme variant"
- #~ msgstr "Utiliser une variante de thème _foncée"
-+
-+msgid "Transparent background"
-+msgstr "Arrière-plan transparent"
-diff --git a/po/fur.po b/po/fur.po
-index 5a20170..8c3daaf 100644
---- a/po/fur.po
-+++ b/po/fur.po
-@@ -580,8 +580,8 @@ msgid "_Text color:"
- msgstr "Colôr dal _test:"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "Fondâl _trasparent"
-+msgid "Transparent background"
-+msgstr "Fondâl trasparent"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/ga.po b/po/ga.po
-index 93d5fa9..feb87dc 100644
---- a/po/ga.po
-+++ b/po/ga.po
-@@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog"
- #: ../src/terminal-window.c:3582
- msgid "C_lose Terminal"
- msgstr "_Dún Teirminéal"
-+
-+msgid "Transparent background"
-+msgstr "Cúlra trédhearcach"
-diff --git a/po/gl.po b/po/gl.po
-index 1429c66..6820190 100644
---- a/po/gl.po
-+++ b/po/gl.po
-@@ -3055,8 +3055,8 @@ msgstr "P_echar a xanela"
- #~ msgid "Background image _scrolls"
- #~ msgstr "A imaxe de fondo _desprázase"
-
--#~ msgid "_Transparent background"
--#~ msgstr "Fondo _transparente"
-+msgid "Transparent background"
-+msgstr "Fondo transparente"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "_Sombra transparente ou imaxe de fondo:"
-diff --git a/po/gu.po b/po/gu.po
-index 0bcb195..f72a807 100644
---- a/po/gu.po
-+++ b/po/gu.po
-@@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)"
- #~ msgid "_Solid color"
- #~ msgstr "ઘટ્ટ રંગ (_S)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ (_T)"
-+msgid "Transparent background"
-+msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ"
-
- #~ msgid "No such profile \"%s\", using default profile\n"
- #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n"
-diff --git a/po/he.po b/po/he.po
-index 0d9dfe0..ff4cc33 100644
---- a/po/he.po
-+++ b/po/he.po
-@@ -3007,8 +3007,8 @@ msgstr "סגירת ה_חלון"
- #~ msgid "_Solid color"
- #~ msgstr "צבע _אחיד"
-
--#~ msgid "_Transparent background"
--#~ msgstr "רקע _שקוף"
-+msgid "Transparent background"
-+msgstr "רקע שקוף"
-
- #~ msgid "No such profile \"%s\", using default profile\n"
- #~ msgstr "No such profile \"%s\", using default profile\n"
-diff --git a/po/hi.po b/po/hi.po
-index 2d7dc5b..adf8d35 100644
---- a/po/hi.po
-+++ b/po/hi.po
-@@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)"
- #~ msgid "_Background image"
- #~ msgstr "पृष्ठभूमि छवि (_B)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "पारदर्शी पृष्ठभूमि (_T)"
-+msgid "Transparent background"
-+msgstr "पारदर्शी पृष्ठभूमि"
-
- #~ msgid "S/Key Challenge Response"
- #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
-diff --git a/po/hr.po b/po/hr.po
-index cb48c52..747cf48 100644
---- a/po/hr.po
-+++ b/po/hr.po
-@@ -1362,8 +1362,8 @@ msgid "_Text color:"
- msgstr "_Boja teksta:"
-
- #: ../src/profile-preferences.glade.h:69
--msgid "_Transparent background"
--msgstr "_Prozirna pozadina"
-+msgid "Transparent background"
-+msgstr "Prozirna pozadina"
-
- #: ../src/profile-preferences.glade.h:70
- msgid "_Update login records when command is launched"
-diff --git a/po/hu.po b/po/hu.po
-index ad585ef..b9a481b 100644
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -2509,3 +2509,6 @@ msgstr "_Ablak bezárása"
-
- #~ msgid "Background type"
- #~ msgstr "Háttér típusa"
-+
-+msgid "Transparent background"
-+msgstr "Áttetsző háttér"
-diff --git a/po/hy.po b/po/hy.po
-index 5584901..caadbba 100644
---- a/po/hy.po
-+++ b/po/hy.po
-@@ -1011,8 +1011,8 @@ msgid "_Text color:"
- msgstr "_Տեքստի գույնը՝"
-
- #: ../src/profile-preferences.glade.h:73
--msgid "_Transparent background"
--msgstr "_Թափանցիկ նախադրյալ"
-+msgid "Transparent background"
-+msgstr "Թափանցիկ նախադրյալ"
-
- #: ../src/profile-preferences.glade.h:74
- msgid "_Update login records when command is launched"
-diff --git a/po/id.po b/po/id.po
-index 346b5d8..2448444 100644
---- a/po/id.po
-+++ b/po/id.po
-@@ -2068,3 +2068,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "Tutup Jende_la"
-+
-+msgid "Transparent background"
-+msgstr "Latar belakang transparan"
-diff --git a/po/it.po b/po/it.po
-index 5a1847f..2eb1d62 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -2093,3 +2093,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "Chiudi _finestra"
-+
-+msgid "Transparent background"
-+msgstr "Sfondo trasparente"
-diff --git a/po/ja.po b/po/ja.po
-index 4f8f4de..ce2ec95 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -1902,3 +1902,6 @@ msgstr "この端末には未だ実行中のプロセスが存在しています
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "ウィンドウを閉じる(_L)"
-+
-+msgid "Transparent background"
-+msgstr "透過な画像にする"
-diff --git a/po/ka.po b/po/ka.po
-index 8415e88..3717b7e 100644
---- a/po/ka.po
-+++ b/po/ka.po
-@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:"
-
- #: ../src/gnome-terminal.glade2.h:86
- #, fuzzy
--msgid "_Transparent background"
-+msgid "Transparent background"
- msgstr "გამჭირვალე"
-
- #: ../src/gnome-terminal.glade2.h:87
-diff --git a/po/kk.po b/po/kk.po
-index dba7503..f7ac993 100644
---- a/po/kk.po
-+++ b/po/kk.po
-@@ -2030,3 +2030,6 @@ msgstr "Терезені жа_бу"
-
- #~ msgid "Be quiet"
- #~ msgstr "Тыныш болу"
-+
-+msgid "Transparent background"
-+msgstr "Мөлдір фон"
-diff --git a/po/kn.po b/po/kn.po
-index c887f88..e899ef3 100644
---- a/po/kn.po
-+++ b/po/kn.po
-@@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)"
-
- #~ msgid "_Title:"
- #~ msgstr "ಶೀರ್ಷಿಕೆ(_T):"
-+
-+msgid "Transparent background"
-+msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ"
-diff --git a/po/ko.po b/po/ko.po
-index 0700e25..912e940 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -2078,3 +2078,6 @@ msgstr "창 닫기(_L)"
-
- #~ msgid "Use _dark theme variant"
- #~ msgstr "어두운 테마 사용(_D)"
-+
-+msgid "Transparent background"
-+msgstr "투명한 배경"
-diff --git a/po/ku.po b/po/ku.po
-index 221825b..96e3581 100644
---- a/po/ku.po
-+++ b/po/ku.po
-@@ -557,8 +557,8 @@ msgid "_Text color:"
- msgstr "Rengê _nivîsê:"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "Rûerdê _transparan"
-+msgid "Transparent background"
-+msgstr "Rûerdê transparan"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/lt.po b/po/lt.po
-index 294482b..c0ec0cf 100644
---- a/po/lt.po
-+++ b/po/lt.po
-@@ -2082,3 +2082,6 @@ msgstr "_Užverti langą"
-
- #~ msgid "Use _dark theme variant"
- #~ msgstr "Nau_doti tamsų temos variantą"
-+
-+msgid "Transparent background"
-+msgstr "Permatomas fonas"
-diff --git a/po/lv.po b/po/lv.po
-index a50f529..b29541f 100644
---- a/po/lv.po
-+++ b/po/lv.po
-@@ -3016,8 +3016,8 @@ msgstr "Aizvērt _logu"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Fona attēla ritināšanā_s"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_Caurspīdīgs fons"
-+msgid "Transparent background"
-+msgstr "Caurspīdīgs fons"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "_Aizēnot caurspīdīgo vai attēla fonu:"
-diff --git a/po/mai.po b/po/mai.po
-index 9b984a0..a3c0e17 100644
---- a/po/mai.po
-+++ b/po/mai.po
-@@ -1290,8 +1290,8 @@ msgid "_Text color:"
- msgstr "पाठ रँग (_T):"
-
- #: ../src/profile-preferences.glade.h:69
--msgid "_Transparent background"
--msgstr "पारदर्शी पृष्ठभूमि (_T)"
-+msgid "Transparent background"
-+msgstr "पारदर्शी पृष्ठभूमि"
-
- #: ../src/profile-preferences.glade.h:70
- msgid "_Update login records when command is launched"
-diff --git a/po/mg.po b/po/mg.po
-index 1c1895c..a805417 100644
---- a/po/mg.po
-+++ b/po/mg.po
-@@ -566,8 +566,8 @@ msgid "_Text color:"
- msgstr "Lokon'ny _soratra:"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "_Afara tatera-pahazavana"
-+msgid "Transparent background"
-+msgstr "Afara tatera-pahazavana"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/mk.po b/po/mk.po
-index e31378a..d2b74d4 100644
---- a/po/mk.po
-+++ b/po/mk.po
-@@ -1166,8 +1166,8 @@ msgid "_Text color:"
- msgstr "_Боја на текстот:"
-
- #: ../src/profile-preferences.glade.h:77
--msgid "_Transparent background"
--msgstr "_Транспарентна позадина"
-+msgid "Transparent background"
-+msgstr "Транспарентна позадина"
-
- #: ../src/profile-preferences.glade.h:78
- #| msgid "_Text color:"
-diff --git a/po/ml.po b/po/ml.po
-index cc1928d..62abd21 100644
---- a/po/ml.po
-+++ b/po/ml.po
-@@ -2751,8 +2751,8 @@ msgstr "ടെര്മിനല് അ_ടയ്ക്കുക"
- #~ msgid "_Solid color"
- #~ msgstr "_സോളിഡ് നിറം"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
-+msgid "Transparent background"
-+msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
-
- #~ msgid "S/Key Challenge Response"
- #~ msgstr "S/Key ചാലഞ്ച് മറുപടി"
-diff --git a/po/mn.po b/po/mn.po
-index 4922041..9696b7f 100644
---- a/po/mn.po
-+++ b/po/mn.po
-@@ -617,8 +617,8 @@ msgid "_Text color:"
- msgstr "_Текстийн өнгө:"
-
- #: ../src/gnome-terminal.glade2.h:102
--msgid "_Transparent background"
--msgstr "_Тунгалаг дэвсгэр"
-+msgid "Transparent background"
-+msgstr "Тунгалаг дэвсгэр"
-
- #: ../src/gnome-terminal.glade2.h:103
- msgid "_Update login records when command is launched"
-diff --git a/po/mr.po b/po/mr.po
-index 61997da..50451d7 100644
---- a/po/mr.po
-+++ b/po/mr.po
-@@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)"
- #~ msgid "_Solid color"
- #~ msgstr "गडद रंग (_S)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "पारदर्शी पार्श्वभूमी(_T)"
-+msgid "Transparent background"
-+msgstr "पारदर्शी पार्श्वभूमी"
-
- #~ msgid "Disabled"
- #~ msgstr "अकार्यान्वीतित"
-diff --git a/po/ms.po b/po/ms.po
-index 5b663aa..38a2afe 100644
---- a/po/ms.po
-+++ b/po/ms.po
-@@ -630,8 +630,8 @@ msgid "_Text color:"
- msgstr "Warna _Teks:"
-
- #: ../src/gnome-terminal.glade2.h:102
--msgid "_Transparent background"
--msgstr "LatarBelakang _Telus"
-+msgid "Transparent background"
-+msgstr "LatarBelakang Telus"
-
- #: ../src/gnome-terminal.glade2.h:103
- msgid "_Update login records when command is launched"
-diff --git a/po/nb.po b/po/nb.po
-index c14ae58..f5a590e 100644
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -2054,3 +2054,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Lukk vindu"
-+
-+msgid "Transparent background"
-+msgstr "Gjennomsiktig bakgrunn"
-diff --git a/po/nds.po b/po/nds.po
-index 98a1287..94fd757 100644
---- a/po/nds.po
-+++ b/po/nds.po
-@@ -995,8 +995,8 @@ msgid "_Text color:"
- msgstr "_Textklöör:"
-
- #: ../src/profile-preferences.glade.h:73
--msgid "_Transparent background"
--msgstr "_Döörschienenachtergrund:"
-+msgid "Transparent background"
-+msgstr "Döörschienenachtergrund:"
-
- #: ../src/profile-preferences.glade.h:74
- msgid "_Update login records when command is launched"
-diff --git a/po/ne.po b/po/ne.po
-index 4fe16cc..d9a90ad 100644
---- a/po/ne.po
-+++ b/po/ne.po
-@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
- #~ msgid "_None (use solid color)"
- #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "पारदर्शी पृष्ठभूमि"
-+msgid "Transparent background"
-+msgstr "पारदर्शी पृष्ठभूमि"
-
- #~ msgid "_Use the system fixed width font"
- #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्"
-diff --git a/po/nl.po b/po/nl.po
-index a51720b..111b032 100644
---- a/po/nl.po
-+++ b/po/nl.po
-@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten"
-
- #~ msgid "Switch to Tab 12"
- #~ msgstr "Ga naar tab 12"
-+
-+msgid "Transparent background"
-+msgstr "Transparante achtergrond"
-diff --git a/po/nn.po b/po/nn.po
-index 91cd6ab..9284459 100644
---- a/po/nn.po
-+++ b/po/nn.po
-@@ -1428,8 +1428,8 @@ msgid "_Text color:"
- msgstr "_Tekstfarge:"
-
- #: ../src/profile-preferences.glade.h:73
--msgid "_Transparent background"
--msgstr "_Gjennomskinleg bakgrunn"
-+msgid "Transparent background"
-+msgstr "Gjennomskinleg bakgrunn"
-
- #: ../src/profile-preferences.glade.h:74
- msgid "_Update login records when command is launched"
-diff --git a/po/oc.po b/po/oc.po
-index 5e7ca58..3bd9991 100644
---- a/po/oc.po
-+++ b/po/oc.po
-@@ -1285,8 +1285,8 @@ msgid "_Text color:"
- msgstr "Color del _tèxt :"
-
- #: ../src/profile-preferences.glade.h:78
--msgid "_Transparent background"
--msgstr "Fons _transparent"
-+msgid "Transparent background"
-+msgstr "Fons transparent"
-
- #: ../src/profile-preferences.glade.h:79
- msgid "_Underline color:"
-diff --git a/po/or.po b/po/or.po
-index ec1e6bf..218acd7 100644
---- a/po/or.po
-+++ b/po/or.po
-@@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):"
- #~ msgid "Background image _scrolls"
- #~ msgstr "ପୃଷ୍ଠଭୂମି ଚିତ୍ର ସ୍କ୍ରୋଲଗୁଡିକ (_s)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି (_T)"
-+msgid "Transparent background"
-+msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):"
-diff --git a/po/pa.po b/po/pa.po
-index 9c95b66..5e5b8ba 100644
---- a/po/pa.po
-+++ b/po/pa.po
-@@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)"
- #~ msgid "_Solid color"
- #~ msgstr "ਇੱਕ ਰੰਗ ਵਰਤੋਂ(_S)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ(_T)"
-+msgid "Transparent background"
-+msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ"
-
- #~ msgid "S/Key Challenge Response"
- #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ"
-diff --git a/po/pl.po b/po/pl.po
-index deb91b7..f772171 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -2116,3 +2116,6 @@ msgid ""
- msgstr ""
- "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza "
- "całkowitą przezroczystość."
-+
-+msgid "Transparent background"
-+msgstr "Przezroczyste tło"
-diff --git a/po/ps.po b/po/ps.po
-index b1de52c..a16ac49 100644
---- a/po/ps.po
-+++ b/po/ps.po
-@@ -1052,8 +1052,8 @@ msgid "_Text color:"
- msgstr ":د ليکنې رنګ_"
-
- #: ../src/profile-preferences.glade.h:69
--msgid "_Transparent background"
--msgstr "روڼ شاليد_"
-+msgid "Transparent background"
-+msgstr "روڼ شاليد"
-
- #: ../src/profile-preferences.glade.h:70
- msgid "_Update login records when command is launched"
-diff --git a/po/pt.po b/po/pt.po
-index 68bb2dd..9078dcb 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -2948,8 +2948,8 @@ msgstr "_Fechar janela"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Imagem de fundo _rola"
-
--#~ msgid "_Transparent background"
--#~ msgstr "Fundo _transparente"
-+msgid "Transparent background"
-+msgstr "Fundo transparente"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "Transparente som_breado ou imagem de fundo:"
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 8fac135..b79275c 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -2865,3 +2865,6 @@ msgstr "_Fechar janela"
- #~ "poderão usar. Essa é a paleta, na forma de uma lista de nomes de cores "
- #~ "separada por dois pontos. Os nomes de cores devem estar no formato "
- #~ "hexadecimal. Exemplo: \"#FF00FF\""
-+
-+msgid "Transparent background"
-+msgstr "Fundo transparente"
-diff --git a/po/ro.po b/po/ro.po
-index 179dd77..f7fc7ae 100644
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -1576,8 +1576,8 @@ msgid "_Text color:"
- msgstr "Culoare _text:"
-
- #: ../src/profile-preferences.glade.h:77
--msgid "_Transparent background"
--msgstr "Fundal _transparent"
-+msgid "Transparent background"
-+msgstr "Fundal transparent"
-
- #: ../src/profile-preferences.glade.h:78
- msgid "_Underline color:"
-diff --git a/po/ru.po b/po/ru.po
-index 01d1683..672ab01 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -2073,3 +2073,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Закрыть окно"
-+
-+msgid "Transparent background"
-+msgstr "Прозрачный фон"
-diff --git a/po/rw.po b/po/rw.po
-index 3f02231..b7fff4c 100644
---- a/po/rw.po
-+++ b/po/rw.po
-@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..."
-
- #: ../src/gnome-terminal.glade2.h:102
- #, fuzzy
--msgid "_Transparent background"
-+msgid "Transparent background"
- msgstr "Mbuganyuma"
-
- #: ../src/gnome-terminal.glade2.h:103
-diff --git a/po/si.po b/po/si.po
-index 81dbf65..5cb0e5a 100644
---- a/po/si.po
-+++ b/po/si.po
-@@ -537,8 +537,8 @@ msgid "_Text color:"
- msgstr "පෙළ වර්ණ: (_T)"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "විනිවිද පෙනෙන පසුබිම (_T)"
-+msgid "Transparent background"
-+msgstr "විනිවිද පෙනෙන පසුබිම"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/sk.po b/po/sk.po
-index 9bef0bf..52e4af2 100644
---- a/po/sk.po
-+++ b/po/sk.po
-@@ -2354,3 +2354,6 @@ msgstr "_Zavrieť okno"
- #~ "\n"
- #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
- #~ "help“.\n"
-+
-+msgid "Transparent background"
-+msgstr "Priehľadné pozadie"
-diff --git a/po/sl.po b/po/sl.po
-index 3a7ee4a..4f6ce0d 100644
---- a/po/sl.po
-+++ b/po/sl.po
-@@ -2316,3 +2316,6 @@ msgstr "_Zapri okno"
-
- #~ msgid "_Profile Preferences…"
- #~ msgstr "Možnosti _profila ..."
-+
-+msgid "Transparent background"
-+msgstr "Prosojno ozadje"
-diff --git a/po/sq.po b/po/sq.po
-index e59c0b6..6fb4090 100644
---- a/po/sq.po
-+++ b/po/sq.po
-@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:"
-
- # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different
- #: ../src/gnome-terminal.glade2.h:85
--msgid "_Transparent background"
--msgstr "Sfond _Trasparent"
-+msgid "Transparent background"
-+msgstr "Sfond Trasparent"
-
- #: ../src/gnome-terminal.glade2.h:86
- msgid "_Update login records when command is launched"
-diff --git a/po/sr.po b/po/sr.po
-index fce0f63..22f129a 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -2230,3 +2230,6 @@ msgstr "_Затвори прозор"
-
- #~ msgid "Close Window"
- #~ msgstr "Затвори прозор"
-+
-+msgid "Transparent background"
-+msgstr "Провидна позадина"
-diff --git a/po/sr@latin.po b/po/sr@latin.po
-index c82646c..55f6a0e 100644
---- a/po/sr@latin.po
-+++ b/po/sr@latin.po
-@@ -2230,3 +2230,6 @@ msgstr "_Zatvori prozor"
-
- #~ msgid "Close Window"
- #~ msgstr "Zatvori prozor"
-+
-+msgid "Transparent background"
-+msgstr "Providna pozadina"
-diff --git a/po/sv.po b/po/sv.po
-index 8f64ba2..b0d6fcb 100644
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -2080,5 +2080,8 @@ msgstr "Stän_g fönster"
- #~ msgid "Unknown completion request for \"%s\""
- #~ msgstr "Okänd kompletteringsbegäran för \"%s\""
-
-+msgid "Transparent background"
-+msgstr "Genomskinlig bakgrund"
-+
- #~ msgid "Missing command"
- #~ msgstr "Kommando saknas"
-diff --git a/po/ta.po b/po/ta.po
-index 80aa2f6..61185b4 100644
---- a/po/ta.po
-+++ b/po/ta.po
-@@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்"
- #~ msgid "_Solid color"
- #~ msgstr "(_S) ஒரே வண்ணம்"
-
--#~ msgid "_Transparent background"
--#~ msgstr "_T புலப்பாடு பின்னணி"
-+msgid "Transparent background"
-+msgstr "புலப்பாடு பின்னணி"
-
- #~ msgid "No such profile \"%s\", using default profile\n"
- #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n"
-diff --git a/po/te.po b/po/te.po
-index 000cda3..6dcf793 100644
---- a/po/te.po
-+++ b/po/te.po
-@@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)"
- #~ msgid "Background image _scrolls"
- #~ msgstr "నేపథ్యచిత్రము స్క్రాల్స్ (_s)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "పారదర్శక నేపథ్యం (_T)"
-+msgid "Transparent background"
-+msgstr "పారదర్శక నేపథ్యం"
-
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్గ్రౌండ్ కు మారు(_h):"
-diff --git a/po/th.po b/po/th.po
-index be9b0cb..482907f 100644
---- a/po/th.po
-+++ b/po/th.po
-@@ -2616,8 +2616,8 @@ msgstr "ปิ_ดหน้าต่าง"
- #~ msgid "_Solid color"
- #~ msgstr "สี_ทึบ"
-
--#~ msgid "_Transparent background"
--#~ msgstr "พื้นหลังโปร่งแ_สง"
-+msgid "Transparent background"
-+msgstr "พื้นหลังโปร่งแสง"
-
- #~ msgid ""
- #~ "You already have a profile called “%s”. Do you want to create another "
-diff --git a/po/tr.po b/po/tr.po
-index 02a704a..78f26ba 100644
---- a/po/tr.po
-+++ b/po/tr.po
-@@ -1968,3 +1968,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Pencereyi Kapat"
-+
-+msgid "Transparent background"
-+msgstr "Şeffaf arkaplan"
-diff --git a/po/ug.po b/po/ug.po
-index 1673bb3..e21e61e 100644
---- a/po/ug.po
-+++ b/po/ug.po
-@@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):"
- #~ msgid "_Solid color"
- #~ msgstr "ساپ رەڭ(_S)"
-
--#~ msgid "_Transparent background"
--#~ msgstr "سۈزۈك تەگلىك(_T)"
-+msgid "Transparent background"
-+msgstr "سۈزۈك تەگلىك"
-
- #~ msgid ""
- #~ "You already have a profile called “%s”. Do you want to create another "
-diff --git a/po/uk.po b/po/uk.po
-index a8db018..414c413 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -2946,8 +2946,8 @@ msgstr "Закр_ити вікно"
- #~ msgid "_Solid color"
- #~ msgstr "_Суцільний колір"
-
--#~ msgid "_Transparent background"
--#~ msgstr "П_розоре тло"
-+msgid "Transparent background"
-+msgstr "Прозоре тло"
-
- #~ msgid "Switch to Tab 2"
- #~ msgstr "До вкладки 2"
-diff --git a/po/vi.po b/po/vi.po
-index e943917..87846ac 100644
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -2671,3 +2671,6 @@ msgstr "Đón_g cửa sổ"
- #~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng "
- #~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị "
- #~ "tắt), nghĩa là không có phím tắt cho hành động này."
-+
-+msgid "Transparent background"
-+msgstr "Nền trong suốt"
-diff --git a/po/wa.po b/po/wa.po
-index 2856571..f068531 100644
---- a/po/wa.po
-+++ b/po/wa.po
-@@ -563,8 +563,8 @@ msgid "_Text color:"
- msgstr "Coleur pol _tecse:"
-
- #: ../src/gnome-terminal.glade2.h:86
--msgid "_Transparent background"
--msgstr "Fond k' on voet _houte"
-+msgid "Transparent background"
-+msgstr "Fond k' on voet houte"
-
- #: ../src/gnome-terminal.glade2.h:87
- msgid "_Update login records when command is launched"
-diff --git a/po/xh.po b/po/xh.po
-index e5981c6..7f9f804 100644
---- a/po/xh.po
-+++ b/po/xh.po
-@@ -620,8 +620,8 @@ msgid "_Text color:"
- msgstr "_Umbala wombhalo:"
-
- #: ../src/gnome-terminal.glade2.h:102
--msgid "_Transparent background"
--msgstr "_Okungasemva okucace gca"
-+msgid "Transparent background"
-+msgstr "Okungasemva okucace gca"
-
- #: ../src/gnome-terminal.glade2.h:103
- msgid "_Update login records when command is launched"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index b18a9e7..287db04 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -2280,3 +2280,6 @@ msgstr "关闭窗口(_L)"
-
- #~ msgid "_Find..."
- #~ msgstr "查找(_F)..."
-+
-+msgid "Transparent background"
-+msgstr "透明背景"
-diff --git a/po/zh_HK.po b/po/zh_HK.po
-index eb0ede7..aceb184 100644
---- a/po/zh_HK.po
-+++ b/po/zh_HK.po
-@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)"
-
- #~ msgid "Show session management options"
- #~ msgstr "顯示作業階段管理選項"
-+
-+msgid "Transparent background"
-+msgstr "透明背景"
-diff --git a/po/zh_TW.po b/po/zh_TW.po
-index a32a539..f0674dc 100644
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -2379,3 +2379,6 @@ msgstr "關閉視窗(_L)"
-
- #~ msgid "Show session management options"
- #~ msgstr "顯示作業階段管理選項"
-+
-+msgid "Transparent background"
-+msgstr "透明背景"
---
-2.1.0
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch
deleted file mode 100644
index 05dd2cb..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 17 Feb 2015 13:22:11 +0100
-Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref"
-
-This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
----
- src/org.gnome.Terminal.gschema.xml | 5 +++++
- src/preferences.ui | 16 ++++++++++++++++
- src/terminal-app.c | 4 ++++
- src/terminal-prefs.c | 9 ++++++++-
- src/terminal-schemas.h | 1 +
- 5 files changed, 34 insertions(+), 1 deletion(-)
-
-Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
-===================================================================
---- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml
-+++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
-@@ -658,6 +658,11 @@
- <summary>Whether to show the menubar in new windows</summary>
- </key>
-
-+ <key name="dark-theme" type="b">
-+ <default>false</default>
-+ <summary>Whether to use a dark theme variant</summary>
-+ </key>
-+
- <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
- <default>'window'</default>
- <summary>Whether to open new terminals as windows or tabs</summary>
-Index: gnome-terminal-3.17.91/src/preferences.ui
-===================================================================
---- gnome-terminal-3.17.91.orig/src/preferences.ui
-+++ gnome-terminal-3.17.91/src/preferences.ui
-@@ -99,6 +99,22 @@
- </packing>
- </child>
- <child>
-+ <object class="GtkCheckButton" id="dark-theme-checkbutton">
-+ <property name="label" translatable="yes">Use _dark theme variant</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">True</property>
-+ <property name="position">3</property>
-+ </packing>
-+ </child>
-+ <child>
- <object class="GtkBox" id="hbox140">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
-Index: gnome-terminal-3.17.91/src/terminal-app.c
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-app.c
-+++ gnome-terminal-3.17.91/src/terminal-app.c
-@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app)
-
- /* Terminal global settings */
- app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
-+ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
-+ gtk_settings_get_default (),
-+ "gtk-application-prefer-dark-theme",
-+ G_SETTINGS_BIND_GET);
-
- /* Check if we need to migrate from gconf to dconf */
- maybe_migrate_settings (app);
-Index: gnome-terminal-3.17.91/src/terminal-prefs.c
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-prefs.c
-+++ gnome-terminal-3.17.91/src/terminal-prefs.c
-@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWind
- GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
- GtkWidget *disable_shortcuts_button;
- GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
-- GtkWidget *new_terminal_mode_combo;
-+ GtkWidget *dark_theme_button, *new_terminal_mode_combo;
- GtkWidget *default_hbox, *default_label;
- GtkWidget *close_button, *help_button;
- GtkTreeSelection *selection;
-@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWind
- "close-button", &close_button,
- "help-button", &help_button,
- "default-show-menubar-checkbutton", &show_menubar_button,
-+ "dark-theme-checkbutton", &dark_theme_button,
- "new-terminal-mode-combobox", &new_terminal_mode_combo,
- "disable-mnemonics-checkbutton", &disable_mnemonics_button,
- "disable-shortcuts-checkbutton", &disable_shortcuts_button,
-@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWind
- "active",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-
-+ g_settings_bind (settings,
-+ TERMINAL_SETTING_DARK_THEME_KEY,
-+ dark_theme_button,
-+ "active",
-+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-+
- g_settings_bind (settings,
- TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
- new_terminal_mode_combo,
-Index: gnome-terminal-3.17.91/src/terminal-schemas.h
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-schemas.h
-+++ gnome-terminal-3.17.91/src/terminal-schemas.h
-@@ -68,6 +68,7 @@ G_BEGIN_DECLS
-
- #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"
- #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
- #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled"
- #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled"
-Index: gnome-terminal-3.17.91/help/C/pref-theme.page
-===================================================================
---- /dev/null
-+++ gnome-terminal-3.17.91/help/C/pref-theme.page
-@@ -0,0 +1,41 @@
-+<page xmlns="http://projectmallard.org/1.0/"
-+ xmlns:its="http://www.w3.org/2005/11/its"
-+ type="guide"
-+ id="pref-theme">
-+
-+ <info>
-+ <link type="guide" xref="index#appearance"/>
-+ <revision pkgversion="3.12" date="2014-02-26" status="review"/>
-+
-+ <credit type="author copyright">
-+ <name>Ekaterina Gerasimova</name>
-+ <email its:translate="no">kittykat3756@gmail.com</email>
-+ <years>2014</years>
-+ </credit>
-+ <!--<credit type="copyright editor">
-+ <name></name>
-+ <email its:translate="no"></email>
-+ <years></years>
-+ </credit>-->
-+
-+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-+ <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
-+ </info>
-+
-+ <title>Chose the window theme</title>
-+
-+ <p>You can chose to use either the dark theme or the light theme for the
-+ terminal window.</p>
-+
-+ <steps>
-+ <item>
-+ <p>Select
-+ <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
-+ </item>
-+ <item>
-+ <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
-+ </item>
-+ </steps>
-+
-+</page>
-Index: gnome-terminal-3.17.91/help/Makefile.am
-===================================================================
---- gnome-terminal-3.17.91.orig/help/Makefile.am
-+++ gnome-terminal-3.17.91/help/Makefile.am
-@@ -35,6 +35,7 @@ HELP_FILES = \
- pref-profile-encoding.page \
- pref-scrolling.page \
- pref-tab-window.page \
-+ pref-theme.page \
- pref-user-input.page \
- profile.page \
- prob-reset.page \
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch
deleted file mode 100644
index 2107da6..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From df5793813d19dccfb6dfa75c1be766df562adb48 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] 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 files changed, 21 insertions(+), 0 deletions(-)
-
-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.7.1
-
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch
deleted file mode 100644
index 5825997..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 1cb63cd1c90cb5bfc8ed2e6d161a7b96c51d8a29 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Mon, 12 May 2014 14:57:18 +0200
-Subject: [PATCH] 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 deletions(-)
-
-Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
-===================================================================
---- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml
-+++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
-@@ -334,6 +334,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 -->
-Index: gnome-terminal-3.17.91/src/profile-editor.c
-===================================================================
---- gnome-terminal-3.17.91.orig/src/profile-editor.c
-+++ gnome-terminal-3.17.91/src/profile-editor.c
-@@ -1097,7 +1097,18 @@ terminal_profile_edit (GSettings *profi
- "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);
-Index: gnome-terminal-3.17.91/src/profile-preferences.ui
-===================================================================
---- gnome-terminal-3.17.91.orig/src/profile-preferences.ui
-+++ gnome-terminal-3.17.91/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="model1">
- <columns>
- <!-- column-name gchararray -->
-@@ -991,6 +996,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">Use t_ransparent 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>
-Index: gnome-terminal-3.17.91/src/terminal-schemas.h
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-schemas.h
-+++ gnome-terminal-3.17.91/src/terminal-schemas.h
-@@ -63,6 +63,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"
-Index: gnome-terminal-3.17.91/src/terminal-screen.c
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-screen.c
-+++ gnome-terminal-3.17.91/src/terminal-screen.c
-@@ -765,7 +765,9 @@ terminal_screen_profile_changed_cb (GSet
- 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))
-@@ -831,6 +833,8 @@ update_color_scheme (TerminalScreen *scr
- 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_style_context_get_state (context), &theme_fg);
-@@ -851,9 +855,25 @@ update_color_scheme (TerminalScreen *scr
- 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
-Index: gnome-terminal-3.17.91/src/terminal-window.c
-===================================================================
---- gnome-terminal-3.17.91.orig/src/terminal-window.c
-+++ gnome-terminal-3.17.91/src/terminal-window.c
-@@ -2586,6 +2586,8 @@ terminal_window_init (TerminalWindow *wi
- TerminalWindowPrivate *priv;
- TerminalApp *app;
- TerminalSettingsList *profiles_list;
-+ GdkScreen *screen;
-+ GdkVisual *visual;
- GtkActionGroup *action_group;
- GtkAction *action;
- GtkUIManager *manager;
-@@ -2601,6 +2603,11 @@ terminal_window_init (TerminalWindow *wi
-
- 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);
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
deleted file mode 100644
index 9b18c85..00000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-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.40:2[dbus]
- >=x11-libs/gtk+-3.10:3[X]
- >=x11-libs/vte-0.40.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() {
- gnome2_src_prepare
- if ! use vanilla; then
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=695371
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=721932
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
- fi
-}
-
-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
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
deleted file mode 100644
index 36ea0e6..00000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 readme.gentoo
-
-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.10:3[X]
- >=x11-libs/vte-0.42.1: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
- epatch "${FILESDIR}"/${PN}-3.18.2-transparency.patch
- epatch "${FILESDIR}"/${PN}-3.18.2-transparency-fix-for-broken-themes.patch
- epatch "${FILESDIR}"/${PN}-3.18.2-dark-theme.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
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
deleted file mode 100644
index 446251c..00000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 readme.gentoo
-
-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.10:3[X]
- >=x11-libs/vte-0.42.1: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
- epatch "${FILESDIR}"/${PN}-3.18.2-transparency.patch
- epatch "${FILESDIR}"/${PN}-3.18.2-transparency-fix-for-broken-themes.patch
- epatch "${FILESDIR}"/${PN}-3.18.2-dark-theme.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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/
@ 2016-10-26 7:03 Gilles Dartiguelongue
0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-26 7:03 UTC (permalink / raw
To: gentoo-commits
commit: 57cb97545f62d9ca7ff722d83ddfdd2aa8da0656
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 22:17:54 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 07:03:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cb9754
x11-terms/gnome-terminal: version bump 3.20.2 → 3.22.0
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(+)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 02ccfcb..986eaeb 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 00000000..981fc6d
--- /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 <debarshir@gnome.org>
+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 @@
+ <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 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 @@
+ <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 -->
+@@ -1036,6 +1041,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 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 <lars.uebernickel@canonical.com>
+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" <otaylor@fishsoup.net>
+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 00000000..edefd38
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/
@ 2017-12-11 20:44 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-12-11 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 7692068bede4749a655c897692b4573e5f85c01b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 20:42:33 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 20:44:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7692068b
x11-terms/gnome-terminal: [QA] Move big patch to a distfile
Closes: https://bugs.gentoo.org/620648
x11-terms/gnome-terminal/Manifest | 1 +
.../files/gnome-terminal-3.22.0-transparency.patch | 463 ---------------------
.../gnome-terminal/gnome-terminal-3.22.2.ebuild | 4 +-
3 files changed, 4 insertions(+), 464 deletions(-)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 23f6320ab04..3dd9aa88041 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,3 +1,4 @@
+DIST gnome-terminal-3.22.0-transparency.patch.xz 4588 BLAKE2B 7cce4166fa2a47cd4cf55e2ee64790f7ed94d4c75b326dca15d49aef0f3a81e9c6200cd84d46b1a251376b4a108e3b94bcb53b3908b9a34306df6467a34c0760 SHA512 f30a25902842345f8c1b81cbe6ea9da25f428ce8867c4e021369b25a17e8135a944fa6ef4b4cba329edc5ad8af8e53c3ca4d61d172085edde80a9ee215323990
DIST gnome-terminal-3.22.2.tar.xz 1952372 BLAKE2B eddaa5b3900211a2823c86353c68b96aa2a5c3f4ccd51c553ab0a5c328b4dc6e922944ea62bfab7a1dd131464196e2a88c3cd365591b5deafc722b826ce18671 SHA512 3fa550c49c35d53c220d1f7a3f3d49d5130e3dd4af657e05627782abb84a449c6632a9919f5a97c78a5b9d92137e8d4bd68d8b880cd86203f866b85b9cda3db3
DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
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
deleted file mode 100644
index 981fc6d1319..00000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-From 000785a2194012702c5245b0ac69b0003371bcdd 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/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 @@
- <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 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 @@
- <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 -->
-@@ -1036,6 +1041,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 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 <lars.uebernickel@canonical.com>
-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" <otaylor@fishsoup.net>
-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.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
index 0ef374d387c..8ca6e4999c7 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
@@ -8,6 +8,8 @@ inherit autotools gnome2 readme.gentoo-r1
DESCRIPTION="The Gnome Terminal"
HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+SRC_URI="${SRC_URI}
+ !vanilla? ( https://dev.gentoo.org/~mgorny/dist/gnome-terminal-3.22.0-transparency.patch.xz )"
LICENSE="GPL-3+"
SLOT="0"
@@ -45,7 +47,7 @@ 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
+ eapply "${WORKDIR}"/${PN}-3.22.0-transparency.patch
eautoreconf
fi
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/
@ 2018-10-06 13:24 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-10-06 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 2b9dc043e918ee6e87f4e72e444dc4c9565bee9a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 13:22:48 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 13:24:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9dc043
x11-terms/gnome-terminal: bump to 3.30.1
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
x11-terms/gnome-terminal/Manifest | 2 +
.../files/separate-new-tab-window.gschema.override | 2 +
.../gnome-terminal/gnome-terminal-3.30.1.ebuild | 85 ++++++++++++++++++++++
3 files changed, 89 insertions(+)
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 78b5121561b..dccf392cfb8 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,4 +1,6 @@
DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B 76c35db10664e02d1537aae586b47062b2ad85a48279426478ab2c9a9a659f728a7c01af2caaf058a71f4918d3d1e35a14c01dd7c67a2cf1aa368b4f4bc6eae7 SHA512 87d77fe8d9ab5b9ca3ff7eddcd462bf718b0f2d9dc1a60a2744ef8015b0910b588e0dc57ab10964602efa47465fd59f91381969157d9255fb5370039319a5f44
DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f
+DIST gnome-terminal-3.30.1-notify-open-title-transparency.patch.xz 32204 BLAKE2B d32cabea06df4290c592814a60443c3fb627ae7e837560bffdd0f803fd970b2962d7fc1d57a53f9bc62bd0ceb23ccade623e0d7099cb2610e599d9c2243c3ec2 SHA512 14e6e9baf1cd3fdd34ba320502de0ba99b0259598947562b5057472b099e85bcb6c60be8e5f58296c222deb85c35ddf5feefd1dbfac83710050e038f6e1b3a28
+DIST gnome-terminal-3.30.1.tar.xz 2099736 BLAKE2B a3100c7faf10f5d8ed3f16ae3ee28a7850e181dcf97ed52c0509143aa88114583466ddd3dfa1ea61372674cd6f16f9490c5ba9fafa4f5ce56eaeebe33ce259d5 SHA512 486fe7a9841114d49428208fdea195f1ce6a27ecfc66e2c77632385a7b106a28d3e6a0f1a198bd08f3e2a89d201ac49dafa376c002eab6470ff9d64cf30194ec
DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
diff --git a/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override
new file mode 100644
index 00000000000..65d39a4966b
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.Terminal.Legacy.Settings]
+unified-menu=false
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
new file mode 100644
index 00000000000..b824aba23f6
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit 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"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+ >=dev-libs/glib-2.42:2
+ >=x11-libs/gtk+-3.20:3
+ >=x11-libs/vte-0.54.1: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 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=dev-util/intltool-0.50
+ dev-util/itstool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+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 separate menuitems for opening tabs and windows
+ # Restore "Set title" support
+ # http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
+ # Depends on vte[-vanilla] for OSC 777 patch in VTE
+ eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
+ fi
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable gnome-shell search-provider) \
+ $(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS"
+ gnome2_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() {
+ gnome2_pkg_postinst
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/
@ 2022-06-27 5:25 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-06-27 5:25 UTC (permalink / raw
To: gentoo-commits
commit: f2b020c57035cd3217078df35446e2a96012b53c
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jun 27 05:05:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 05:23:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b020c5
x11-terms/gnome-terminal: fix missing define
https://gitlab.gnome.org/GNOME/vte/-/issues/72
Someone already tried to upstream a similar patch to gnome vte that
would fix this but was rejected by maintainer. More info can be found
on the link above.
W_EXITCODE is missing in musl thus causing gnome-terminal build to fail.
This patch checks if W_EXITCODE is not defined and then defines it.
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25872
Signed-off-by: Sam James <sam <AT> gentoo.org>
...nome-terminal-3.44.1-fix-missing-wexitcode.patch | 21 +++++++++++++++++++++
.../gnome-terminal/gnome-terminal-3.44.1.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
new file mode 100644
index 000000000000..aff2237db902
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
@@ -0,0 +1,21 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+Someone already tried to upstream a similar patch to gnome vte that
+would fix this but was rejected by maintainer. More info can be found
+on the link above.
+
+W_EXITCODE is missing in musl thus causing gnome-terminal build to fail.
+This patch checks if W_EXITCODE is not defined and then defines it.
+--- a/src/terminal.cc
++++ b/src/terminal.cc
+@@ -47,6 +47,11 @@
+ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free)
+ #define gs_free_options __attribute__ ((cleanup(gs_local_options_free)))
+
++/* fix for musl */
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#endif
++
+ /* Wait-for-exit helper */
+
+ typedef struct {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
index ee6bad56441b..079de738bb03 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
@@ -47,6 +47,7 @@ DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
. /etc/profile.d/vte-2.91.sh"
src_prepare() {
+ eapply "${FILESDIR}"/${P}-fix-missing-wexitcode.patch
if ! use vanilla; then
# https://bugzilla.gnome.org/show_bug.cgi?id=695371
# Fedora patches:
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-27 5:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-26 7:03 [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2022-06-27 5:25 Sam James
2018-10-06 13:24 Mart Raudsepp
2017-12-11 20:44 Michał Górny
2016-10-26 7:03 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox