x11-terms/gnome-terminal: Version bump

Package-Manager: portage-2.2.24

3 files changed, 501 insertions, 0 deletions

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
new file mode 100644
index 000000000000..05dd2cb2c427
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch
@@ -0,0 +1,176 @@
+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
new file mode 100644
index 000000000000..2107da68ca20
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch
@@ -0,0 +1,62 @@
+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
new file mode 100644
index 000000000000..58259975cb1a
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch
@@ -0,0 +1,263 @@
+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);