rpms/gnome-terminal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.33.90

Browse Source 
- Rebase the patches
This commit is contained in:
Kalev Lember 2019-09-04 14:45:00 +02:00
parent 961cf3101a
commit b2b6d7b00e
4 changed files with 164 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -89,3 +89,4 @@ gnome-terminal-2.31.3.tar.bz2
/gnome-terminal-3.32.0.tar.xz
/gnome-terminal-3.32.1.tar.xz
/gnome-terminal-3.32.2.tar.xz
/gnome-terminal-3.33.90.tar.xz

306
gnome-terminal-cntr-ntfy-autottl-ts.patch
View File

@ -1,4 +1,4 @@
From b87294e006afaa7417b68bc869ef3a3c0ebffc07 Mon Sep 17 00:00:00 2001
From 25d304cc3e216c133d889e7504535c140c5e6775 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 12 May 2014 14:57:18 +0200
Subject: [PATCH 01/18] Restore transparency
@ -25,10 +25,10 @@ Some changes by Peter Weber <peter.weber@mailbox.org>
6 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index e4e0c003b281..1b0fb22b7d46 100644
index b9e7d741ee5c..cd64124c1a6e 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -395,6 +395,16 @@
@@ -405,6 +405,16 @@
<default>'narrow'</default>
<summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
</key>
@ -46,7 +46,7 @@ index e4e0c003b281..1b0fb22b7d46 100644
<!-- Keybinding settings -->
diff --git a/src/preferences.ui b/src/preferences.ui
index 4788959aeec0..47f1cf8abce2 100644
index f42b652c586b..60ab5b253876 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -77,6 +77,11 @@
@ -61,7 +61,7 @@ index 4788959aeec0..47f1cf8abce2 100644
<object class="GtkListStore" id="cjk-ambiguous-width-model">
<columns>
<!-- column-name gchararray -->
@@ -1317,6 +1322,48 @@
@@ -1316,6 +1321,48 @@
<property name="position">1</property>
</packing>
</child>
@ -138,10 +138,10 @@ index 1912c8cf2431..a0081e23a1c5 100644
/* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index ef30bd595374..a386938b64c5 100644
index bd2fa8c5a857..82bbe45ade96 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -73,6 +73,9 @@ G_BEGIN_DECLS
@@ -75,6 +75,9 @@ G_BEGIN_DECLS
#define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name"
#define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions"
@ -152,7 +152,7 @@ index ef30bd595374..a386938b64c5 100644
#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 a85fcefd40e1..26202e4555ea 100644
index 684da49afeb9..00aed8f53b78 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -800,7 +800,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@ -166,7 +166,7 @@ index a85fcefd40e1..26202e4555ea 100644
update_color_scheme (screen);
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
@@ -877,6 +879,8 @@ update_color_scheme (TerminalScreen *screen)
@@ -884,6 +886,8 @@ update_color_scheme (TerminalScreen *screen)
GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
GtkStyleContext *context;
@ -175,7 +175,7 @@ index a85fcefd40e1..26202e4555ea 100644
gboolean use_theme_colors;
context = gtk_widget_get_style_context (widget);
@@ -918,6 +922,18 @@ update_color_scheme (TerminalScreen *screen)
@@ -925,6 +929,18 @@ update_color_scheme (TerminalScreen *screen)
}
colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
@ -194,7 +194,7 @@ index a85fcefd40e1..26202e4555ea 100644
vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
colors, n_colors);
vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
@@ -925,6 +941,10 @@ update_color_scheme (TerminalScreen *screen)
@@ -932,6 +948,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);
@ -231,10 +231,10 @@ index 19198f49f7b5..5ba767c5fc87 100644
uuid_unparse (u, uuidstr);
priv->uuid = g_strdup (uuidstr);
--
2.20.1
2.23.0
From e6d5fe9d911008876330b8141c95c584f6c7fc16 Mon Sep 17 00:00:00 2001
From 1e8e681997cef3f17447a30fddcd54bda94930bc 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 02/18] window: Make the drawing robust across all themes
@ -293,10 +293,10 @@ index 5ba767c5fc87..cdd69f9f4f52 100644
widget_class->screen_changed = terminal_window_screen_changed;
widget_class->style_updated = terminal_window_style_updated;
--
2.20.1
2.23.0
From c1fbed1804a5a8a40f65efb7bfb4f00a37961cb4 Mon Sep 17 00:00:00 2001
From 9f2d96542788d7b46bd99cd9689a86fec10de237 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 03/18] screen, window: Extra padding around transparent
@ -309,7 +309,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
2 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 26202e4555ea..c0ce8a89126c 100644
index 00aed8f53b78..ffa7b3239cae 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -139,6 +139,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@ -329,7 +329,7 @@ index 26202e4555ea..c0ce8a89126c 100644
terminal_class->child_exited = terminal_screen_child_exited;
@@ -864,6 +867,32 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -871,6 +874,32 @@ terminal_screen_profile_changed_cb (GSettings *profile,
g_object_thaw_notify (object);
}
@ -362,7 +362,7 @@ index 26202e4555ea..c0ce8a89126c 100644
static void
update_color_scheme (TerminalScreen *screen)
{
@@ -942,9 +971,7 @@ update_color_scheme (TerminalScreen *screen)
@@ -949,9 +978,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);
@ -373,7 +373,7 @@ index 26202e4555ea..c0ce8a89126c 100644
}
static void
@@ -1549,6 +1576,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
@@ -1556,6 +1583,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
terminal_screen_popup_info_unref (info);
}
@ -420,10 +420,10 @@ index cdd69f9f4f52..6028ca8700d7 100644
return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
--
2.20.1
2.23.0
From de6fc6871c9bae0856c33e6a727bb5e8a77a1bf9 Mon Sep 17 00:00:00 2001
From dd30d93117ce43f720f33d2a4311250d1c36c95c Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 27 Feb 2017 16:53:51 +0100
Subject: [PATCH 04/18] screen: Silence -Wunused variable
@ -434,10 +434,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
1 file changed, 1 deletion(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index c0ce8a89126c..1b763a3890dd 100644
index ffa7b3239cae..6cb3e20c4f42 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -908,7 +908,6 @@ update_color_scheme (TerminalScreen *screen)
@@ -915,7 +915,6 @@ update_color_scheme (TerminalScreen *screen)
GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
GtkStyleContext *context;
@ -446,10 +446,10 @@ index c0ce8a89126c..1b763a3890dd 100644
gboolean use_theme_colors;
--
2.20.1
2.23.0
From c426267330d5b3521d96a7c07958680f206b74f1 Mon Sep 17 00:00:00 2001
From 59f628fd6c4d17b730601a3c771a0a63d87b4981 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 18 May 2018 20:15:34 +0200
Subject: [PATCH 05/18] screen: Try harder to find a foreground process group
@ -475,10 +475,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 1b763a3890dd..db281cbf13c5 100644
index 6cb3e20c4f42..ae3254a10dcf 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -2136,7 +2136,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
@@ -2143,7 +2143,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
#else
g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid);
if (!g_file_get_contents (filename, &data_buf, &len, NULL))
@ -516,10 +516,10 @@ index 1b763a3890dd..db281cbf13c5 100644
#endif
--
2.20.1
2.23.0
From a78b03eee4c5f42aebf197d5619fbd6270d67b2f Mon Sep 17 00:00:00 2001
From 9acd62a80108620c0fb63b158fb445a4d88b53c7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 3 May 2018 16:49:28 +0200
Subject: [PATCH 06/18] screen: Track the current foreground process
@ -539,7 +539,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 130 insertions(+)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index db281cbf13c5..d03f82b092aa 100644
index ae3254a10dcf..7dda7a905156 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -87,13 +87,17 @@ struct _TerminalScreenPrivate
@ -616,7 +616,7 @@ index db281cbf13c5..d03f82b092aa 100644
g_free (priv->initial_working_directory);
g_strfreev (priv->override_command);
g_strfreev (priv->initial_env);
@@ -1760,6 +1786,110 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1767,6 +1793,110 @@ terminal_screen_child_exited (VteTerminal *terminal,
}
}
@ -728,10 +728,10 @@ index db281cbf13c5..d03f82b092aa 100644
terminal_screen_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
--
2.20.1
2.23.0
From eea40f74619165002e8ba5e8cc27b7115ea35acb Mon Sep 17 00:00:00 2001
From 3b2abc48961f576a2277d06e33655e96fea88635 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 10 May 2018 19:23:16 +0200
Subject: [PATCH 07/18] Notify when a long-running foreground process group
@ -809,7 +809,7 @@ index ab1c81a6b554..34c53f40904b 100644
app_load_css (application);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index d03f82b092aa..94b077cc7141 100644
index 7dda7a905156..5d3ec19aa94d 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -55,6 +55,7 @@
@ -853,7 +853,7 @@ index d03f82b092aa..94b077cc7141 100644
/* Unset child PID so that when an eventual child-exited signal arrives,
* we don't emit "close".
@@ -1690,6 +1701,43 @@ terminal_screen_button_press (GtkWidget *widget,
@@ -1697,6 +1708,43 @@ terminal_screen_button_press (GtkWidget *widget,
return FALSE;
}
@ -897,7 +897,7 @@ index d03f82b092aa..94b077cc7141 100644
/**
* terminal_screen_get_current_dir:
* @screen:
@@ -1829,6 +1877,57 @@ terminal_screen_contents_changed (VteTerminal *terminal)
@@ -1836,6 +1884,57 @@ terminal_screen_contents_changed (VteTerminal *terminal)
screen);
}
@ -955,7 +955,7 @@ index d03f82b092aa..94b077cc7141 100644
static void
terminal_screen_shell_precmd (VteTerminal *terminal)
{
@@ -1849,6 +1948,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -1856,6 +1955,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
priv->shell_preexec_source_id = 0;
}
@ -1043,10 +1043,10 @@ index 20cfbceb36b0..a987025e0524 100644
G_END_DECLS
--
2.20.1
2.23.0
From 5f2541b4d1cdb2a7f52fc9b0b40c32583311da88 Mon Sep 17 00:00:00 2001
From d50869cffbbfe79c50203cfc659fcd6125259913 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 2 Apr 2019 16:37:48 +0200
Subject: [PATCH 08/18] Sprinkle debug messages for notifications
@ -1088,10 +1088,10 @@ index 0fafcc3a846c..af1358683994 100644
void _terminal_debug_init(void);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 94b077cc7141..e58c69741c37 100644
index 5d3ec19aa94d..59a957fa2d61 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1709,6 +1709,8 @@ terminal_screen_focus_in (GtkWidget *widget,
@@ -1716,6 +1716,8 @@ terminal_screen_focus_in (GtkWidget *widget,
TerminalApp *app;
TerminalWindow *window;
@ -1100,7 +1100,7 @@ index 94b077cc7141..e58c69741c37 100644
window = terminal_screen_get_window (screen);
if (window != NULL)
{
@@ -1851,6 +1853,9 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
@@ -1858,6 +1860,9 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
g_free (priv->current_cmdline);
priv->current_cmdline = g_steal_pointer (&cmdline);
@ -1110,7 +1110,7 @@ index 94b077cc7141..e58c69741c37 100644
out:
priv->contents_changed_source_id = 0;
@@ -1910,6 +1915,7 @@ terminal_screen_show_notification (TerminalScreen *screen)
@@ -1917,6 +1922,7 @@ terminal_screen_show_notification (TerminalScreen *screen)
terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label),
"dialog-information-symbolic",
_("Command completed"));
@ -1118,7 +1118,7 @@ index 94b077cc7141..e58c69741c37 100644
}
}
else
@@ -1925,6 +1931,7 @@ terminal_screen_show_notification (TerminalScreen *screen)
@@ -1932,6 +1938,7 @@ terminal_screen_show_notification (TerminalScreen *screen)
app = terminal_app_get ();
g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
@ -1126,7 +1126,7 @@ index 94b077cc7141..e58c69741c37 100644
}
}
@@ -1968,6 +1975,9 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
@@ -1975,6 +1982,9 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
goto out;
priv->current_cmdline = g_steal_pointer (&cmdline);
@ -1137,10 +1137,10 @@ index 94b077cc7141..e58c69741c37 100644
priv->shell_preexec_source_id = 0;
retval = G_SOURCE_REMOVE;
--
2.20.1
2.23.0
From e2068064e1a1d32f54bb573a6aa1ab05981fcb93 Mon Sep 17 00:00:00 2001
From ae49abcd2174496c998bb8975f6ad777742ff694 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 15:39:35 +0200
Subject: [PATCH 09/18] profile: Split the Command tab into two nested GtkGrids
@ -1154,10 +1154,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
1 file changed, 90 insertions(+), 83 deletions(-)
diff --git a/src/preferences.ui b/src/preferences.ui
index 47f1cf8abce2..b35cf5e8999a 100644
index 60ab5b253876..1ae8c67caeea 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -1863,95 +1863,102 @@
@@ -1862,95 +1862,102 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
@ -1344,10 +1344,10 @@ index 47f1cf8abce2..b35cf5e8999a 100644
</object>
<packing>
--
2.20.1
2.23.0
From 4cb47eeffdd2a2b130b1ba91fe8de85eb86e41ef Mon Sep 17 00:00:00 2001
From fedece5b966d4a06fc049f378dbbbdf40c9118b8 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 16:01:51 +0200
Subject: [PATCH 10/18] Revert "profile: Remove the "Command" sub-heading"
@ -1360,10 +1360,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
1 file changed, 109 insertions(+), 70 deletions(-)
diff --git a/src/preferences.ui b/src/preferences.ui
index b35cf5e8999a..a4b2027ff300 100644
index 1ae8c67caeea..8417e6c5ba21 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -1871,94 +1871,133 @@
@@ -1870,94 +1870,133 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@ -1568,10 +1568,10 @@ index b35cf5e8999a..a4b2027ff300 100644
</object>
<packing>
--
2.20.1
2.23.0
From be6152b01aaf0131b3ed06af1aac868c5948a587 Mon Sep 17 00:00:00 2001
From 739c4a603d4d195e7febe5957922fdaaf02ac08c Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:02:13 +0200
Subject: [PATCH 11/18] Revert "screen: Remove unused description and
@ -1586,7 +1586,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
2 files changed, 68 insertions(+)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index e58c69741c37..4e3f7606b85a 100644
index 59a957fa2d61..455e3db54bf6 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -89,6 +89,7 @@ struct _TerminalScreenPrivate
@ -1667,7 +1667,7 @@ index e58c69741c37..4e3f7606b85a 100644
static void
terminal_screen_profile_changed_cb (GSettings *profile,
const char *prop_name,
@@ -1099,6 +1128,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
@@ -1106,6 +1135,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
g_object_unref (old_profile);
g_object_notify (G_OBJECT (screen), "profile");
@ -1675,7 +1675,7 @@ index e58c69741c37..4e3f7606b85a 100644
}
GSettings*
@@ -1429,6 +1459,8 @@ spawn_result_cb (VteTerminal *terminal,
@@ -1436,6 +1466,8 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid;
@ -1684,7 +1684,7 @@ index e58c69741c37..4e3f7606b85a 100644
if (error) {
GtkWidget *info_bar;
@@ -1740,6 +1772,35 @@ terminal_screen_focus_in (GtkWidget *widget,
@@ -1747,6 +1779,35 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
}
@ -1720,7 +1720,7 @@ index e58c69741c37..4e3f7606b85a 100644
/**
* terminal_screen_get_current_dir:
* @screen:
@@ -1793,6 +1854,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1800,6 +1861,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1;
@ -1747,10 +1747,10 @@ index ff77fcf78947..af9583e7cbaf 100644
char *terminal_screen_get_current_dir (TerminalScreen *screen);
--
2.20.1
2.23.0
From aaa1db2671ada1184f5cc2270cd9aebf445181b2 Mon Sep 17 00:00:00 2001
From 22df11986f83c263941e26505a188b4b0eee1126 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 17:39:48 +0200
Subject: [PATCH 12/18] Revert "Remove the static title setting from profile
@ -1768,7 +1768,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
5 files changed, 91 insertions(+)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 1b0fb22b7d46..0c50f82f4e47 100644
index cd64124c1a6e..acd2a87702e8 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -183,6 +183,11 @@
@ -1780,14 +1780,14 @@ index 1b0fb22b7d46..0c50f82f4e47 100644
+ <summary>Title for terminal</summary>
+ <description>Title to display for the terminal window or tab. This title may be replaced by or combined with the title set by the application inside the terminal, depending on the title_mode setting.</description>
+ </key>
<key name="allow-bold" type="b">
<key name="enable-bidi" type="b">
<default>true</default>
<summary>Whether to allow bold text</summary>
<summary>Whether to perform bidirectional text rendering</summary>
diff --git a/src/preferences.ui b/src/preferences.ui
index a4b2027ff300..18f7e097e666 100644
index 8417e6c5ba21..2f1ba2811ca2 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -1864,6 +1864,77 @@
@@ -1863,6 +1863,77 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">18</property>
@ -1882,10 +1882,10 @@ index a0081e23a1c5..da8a7fdc4b85 100644
gtk_builder_get_object (builder,
"use-custom-command-checkbutton"),
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index a386938b64c5..f9222855b231 100644
index 82bbe45ade96..8b6b55be6188 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -66,6 +66,7 @@ G_BEGIN_DECLS
@@ -68,6 +68,7 @@ G_BEGIN_DECLS
#define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke"
#define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output"
#define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode"
@ -1894,7 +1894,7 @@ index a386938b64c5..f9222855b231 100644
#define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey"
#define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 4e3f7606b85a..077f6b5fa042 100644
index 455e3db54bf6..345549a07f44 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -800,11 +800,14 @@ char *
@ -1926,10 +1926,10 @@ index 4e3f7606b85a..077f6b5fa042 100644
(!prop_name ||
prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
--
2.20.1
2.23.0
From a4ec1a45e29805babb614c0ce6222ab687625241 Mon Sep 17 00:00:00 2001
From edf2b4df0ae1c29235a0dc8ab1b799335079bbaa Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 17:06:17 +0100
Subject: [PATCH 13/18] Restore translations for setting a title and
@ -1953,7 +1953,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/ca@valencia.po | 12 ++++++++++++
po/cs.po | 12 ++++++++++++
po/cy.po | 8 ++++----
po/da.po | 11 +++++++++++
po/da.po | 12 ++++++++++++
po/de.po | 12 ++++++++++++
po/dz.po | 8 ++++----
po/el.po | 15 +++++++++------
@ -1963,7 +1963,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/eo.po | 8 ++++----
po/es.po | 16 ++++++++--------
po/et.po | 3 +++
po/eu.po | 11 +++++++++++
po/eu.po | 12 ++++++++++++
po/fa.po | 15 +++++++++------
po/fi.po | 12 ++++++++++++
po/fr.po | 12 ++++++++++++
@ -2028,7 +2028,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/zh_CN.po | 15 +++++++++------
po/zh_HK.po | 15 +++++++++------
po/zh_TW.po | 15 +++++++++------
92 files changed, 709 insertions(+), 363 deletions(-)
92 files changed, 711 insertions(+), 363 deletions(-)
diff --git a/po/am.po b/po/am.po
index 3445d96da657..ee992f0712a5 100644
@ -2385,11 +2385,11 @@ index 49e710859ac9..8703552984b1 100644
+msgid "Set Title"
+msgstr "Postavi naslov"
diff --git a/po/ca.po b/po/ca.po
index bd77fe3bea60..371fa1180d08 100644
index 9bb8a5e5f9f1..340b4a8bc4f4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2315,3 +2315,15 @@ msgstr ""
#: ../src/terminal-window.c:3246
@@ -2332,3 +2332,15 @@ msgstr ""
#: ../src/terminal-window.c:3256
msgid "C_lose Window"
msgstr "Tanca la _finestra"
+
@ -2471,13 +2471,14 @@ index 644df82363f1..cd862feb50c0 100644
#: ../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 b9e57183b071..1d00234c0fb5 100644
index 26947a7a6fa1..441bb5ce0e73 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2337,3 +2337,14 @@ msgstr "_Luk vindue"
#~ msgid "Open the terminal file manager Midnight Commander"
#~ msgstr "Åbn terminalfilhåndteringen Midnight Commander"
@@ -2298,3 +2298,15 @@ msgstr ""
#: ../src/terminal-window.c:3256
msgid "C_lose Window"
msgstr "_Luk vindue"
+
+msgid "Title"
+msgstr "Titel"
+
@ -2697,10 +2698,10 @@ index 2956aa8c3f6d..a91669d7a5e0 100644
#~ msgid "On the left side"
#~ msgstr "Maldekstre"
diff --git a/po/es.po b/po/es.po
index b54ad88fa136..1205b871d122 100644
index 26401a60f509..f44295c5d113 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2738,17 +2738,17 @@ msgstr "_Cerrar ventana"
@@ -2750,17 +2750,17 @@ msgstr "_Cerrar ventana"
#~ msgid "Default size:"
#~ msgstr "Tamaño predeterminado:"
@ -2724,7 +2725,7 @@ index b54ad88fa136..1205b871d122 100644
#~ msgid "Current Locale"
#~ msgstr "Configuración regional actual"
@@ -3574,8 +3574,8 @@ msgstr "_Cerrar ventana"
@@ -3586,8 +3586,8 @@ msgstr "_Cerrar ventana"
#~ msgid "_Solid color"
#~ msgstr "Color _sólido"
@ -2747,13 +2748,14 @@ index 4b1c2a7c67e4..770761168806 100644
+msgid "Transparent background"
+msgstr "Läbipaistev taust"
diff --git a/po/eu.po b/po/eu.po
index c475344c165b..26d74747ad6a 100644
index 6d71f53e5005..2ef191d5d6e3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2172,3 +2172,14 @@ msgstr "Oraindik prozesu bat exekutatzen ari da terminal honetan. Terminal hau i
@@ -2188,3 +2188,15 @@ msgstr "Oraindik prozesu bat exekutatzen ari da terminal honetan. Terminal hau i
#: ../src/terminal-window.c:3256
msgid "C_lose Window"
msgstr "It_xi leihoa"
+
+msgid "Title"
+msgstr "Titulua"
+
@ -2829,13 +2831,13 @@ index 1d341ed83115..7ab745dafa50 100644
+msgid "Set Title"
+msgstr "Aseta otsikko"
diff --git a/po/fr.po b/po/fr.po
index 927c1dd5d3af..a539d62c2646 100644
index 6cd261bd12e8..2d653ab35141 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2607,3 +2607,15 @@ msgstr "Fermer _la fenêtre"
#~ msgid "_Same as text color"
#~ msgstr "_Même couleur que le texte"
@@ -2359,3 +2359,15 @@ msgstr ""
#: ../src/terminal-window.c:3256
msgid "C_lose Window"
msgstr "Fermer _la fenêtre"
+
+msgid "Transparent background"
+msgstr "Arrière-plan transparent"
@ -2849,10 +2851,10 @@ index 927c1dd5d3af..a539d62c2646 100644
+msgid "Set Title"
+msgstr "Définir le titre"
diff --git a/po/fur.po b/po/fur.po
index d4a67b1cbcd0..81841080e39e 100644
index 9749184f89b9..a000152a6164 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -445,6 +445,10 @@ msgstr ""
@@ -461,6 +461,10 @@ msgstr ""
msgid "Which encoding to use"
msgstr "Codifiche di doprâ"
@ -2860,10 +2862,10 @@ index d4a67b1cbcd0..81841080e39e 100644
+msgid "Transparent background"
+msgstr "Fondâl trasparent"
+
#: ../src/org.gnome.Terminal.gschema.xml.h:66
#: ../src/org.gnome.Terminal.gschema.xml.h:70
msgid ""
"Whether ambiguous-width characters are narrow or wide when using UTF-8 "
@@ -3384,6 +3388,9 @@ msgstr "_Siere barcon"
@@ -3401,6 +3405,9 @@ msgstr "_Siere barcon"
#~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge."
#~ msgstr "Il test fracât nol samee jessi un OTP challenge."
@ -2873,7 +2875,7 @@ index d4a67b1cbcd0..81841080e39e 100644
#~ msgid "Switch to Tab 3"
#~ msgstr "Passe a la schede 3"
@@ -3439,8 +3446,8 @@ msgstr "_Siere barcon"
@@ -3456,8 +3463,8 @@ msgstr "_Siere barcon"
#~ msgid "_Input Methods"
#~ msgstr "_Cemût inserî test"
@ -3071,10 +3073,10 @@ index 2d7dc5b14008..8d3d0529df61 100644
#~ msgid "S/Key Challenge Response"
#~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
diff --git a/po/hr.po b/po/hr.po
index 9722611b3bca..28c07301cb7e 100644
index 0b617d94ebd6..5f5bfd52514d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2574,3 +2574,13 @@ msgstr "_Zatvori prozor"
@@ -2591,3 +2591,13 @@ msgstr "_Zatvori prozor"
#~ msgid "Use transparency from system theme"
#~ msgstr "Koristi prozirnost iz teme sustava"
@ -3134,10 +3136,10 @@ index aaf2d9b292da..4d466f164420 100644
#: ../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 ce49d31f1348..b47b9656a834 100644
index 41bbbe3f1eb6..4b89d0f76328 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2559,3 +2559,15 @@ msgstr "Tutup Jende_la"
@@ -2576,3 +2576,15 @@ msgstr "Tutup Jende_la"
#~ msgid "_Add or Remove…"
#~ msgstr "T_ambah atau Hapus…"
@ -3874,10 +3876,10 @@ index 5181419ad973..3df37f6d5bc7 100644
#~ 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 fc9eb831d667..153a1f3d8bee 100644
index 6e438ba8699f..c76df0b991a4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2705,17 +2705,17 @@ msgstr "_Fechar janela"
@@ -2717,17 +2717,17 @@ msgstr "_Fechar janela"
#~ msgid "Default size:"
#~ msgstr "Tamanho padrão:"
@ -3901,7 +3903,7 @@ index fc9eb831d667..153a1f3d8bee 100644
#~ msgid "Current Locale"
#~ msgstr "Codificação atual"
@@ -3341,3 +3341,6 @@ msgstr "_Fechar janela"
@@ -3353,3 +3353,6 @@ msgstr "_Fechar janela"
#~ "terminal 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\""
@ -3909,10 +3911,10 @@ index fc9eb831d667..153a1f3d8bee 100644
+msgid "Transparent background"
+msgstr "Fundo transparente"
diff --git a/po/ro.po b/po/ro.po
index b7ec580b8d4f..9440c93c2f26 100644
index 6fcd5af03629..cdf6100c8dd3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3358,8 +3358,8 @@ msgstr "Î_nchide fereastra"
@@ -3376,8 +3376,8 @@ msgstr "Î_nchide fereastra"
#~ msgid "_Solid color"
#~ msgstr "Culoare _solidă"
@ -4015,10 +4017,10 @@ index d0282159b459..01dd96a06939 100644
+msgid "Set Title"
+msgstr "Nastaviť titulok"
diff --git a/po/sl.po b/po/sl.po
index 09e7f51e707c..b00813d45d58 100644
index 2335257b8cf4..417872b90c2c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2680,17 +2680,17 @@ msgstr "_Zapri okno"
@@ -2699,17 +2699,17 @@ msgstr "_Zapri okno"
#~ msgid "Default size:"
#~ msgstr "Privzeta velikost:"
@ -4042,7 +4044,7 @@ index 09e7f51e707c..b00813d45d58 100644
#~ msgid "Current Locale"
#~ msgstr "Trenutne jezikovne nastavitve"
@@ -2805,3 +2805,6 @@ msgstr "_Zapri okno"
@@ -2824,3 +2824,6 @@ msgstr "_Zapri okno"
#~ msgid "_Profile Preferences…"
#~ msgstr "Možnosti _profila ..."
@ -4619,10 +4621,10 @@ index 44a8e21c7842..12aa6d190d99 100644
#: ../src/terminal-window.c:986
msgid "Set _Character Encoding"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d6403609493..7a053e7a86ef 100644
index 76110839f611..c2fd7ce5fd50 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2600,17 +2600,17 @@ msgstr "关闭窗口(_L)"
@@ -2599,17 +2599,17 @@ msgstr "关闭窗口(_L)"
#~ msgid "Default size:"
#~ msgstr "默认大小："
@ -4646,7 +4648,7 @@ index 3d6403609493..7a053e7a86ef 100644
#~ msgid "Current Locale"
#~ msgstr "当前区域"
@@ -2723,3 +2723,6 @@ msgstr "关闭窗口(_L)"
@@ -2722,3 +2722,6 @@ msgstr "关闭窗口(_L)"
#~ msgid "_Find..."
#~ msgstr "查找(_F)..."
@ -4724,10 +4726,10 @@ index e740ebc6df0b..2fa8c3236b8f 100644
+msgid "Transparent background"
+msgstr "透明背景"
--
2.20.1
2.23.0
From 82d9e539e359f2e9b5aa8edf61fa407c4a9b8e14 Mon Sep 17 00:00:00 2001
From 4a213244be992c58a4ee63406fa006727a5e2e14 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 25 May 2016 13:47:36 +0200
Subject: [PATCH 14/18] Restore the action and shortcut to set a static title
@ -4744,10 +4746,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
3 files changed, 81 insertions(+)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 0c50f82f4e47..aaa9e0e97ced 100644
index acd2a87702e8..a6b7673828e5 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -475,6 +475,10 @@
@@ -485,6 +485,10 @@
<default>'disabled'</default>
<summary>Keyboard shortcut to toggle the read-only state</summary>
</key>
@ -4872,10 +4874,10 @@ index 6028ca8700d7..7fda0fe5128e 100644
{ "tab-detach", action_tab_detach_cb, NULL, NULL, NULL },
{ "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL },
--
2.20.1
2.23.0
From 72a0e2496fa30a94effab9ae05302e2f795eea7d Mon Sep 17 00:00:00 2001
From 35b6483eb688a1346164bab26f753a5cd1d569eb Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 18:14:36 +0200
Subject: [PATCH 15/18] screen: Style fix
@ -4889,7 +4891,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 077f6b5fa042..3a49baa07a3f 100644
index 345549a07f44..a333e57097ef 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -717,7 +717,7 @@ terminal_screen_new (GSettings *profile,
@ -4902,10 +4904,10 @@ index 077f6b5fa042..3a49baa07a3f 100644
const char *p;
--
2.20.1
2.23.0
From 23dbfde86385770d30d918ec39d229177995d1fc Mon Sep 17 00:00:00 2001
From 40d29247e955ae1d217c472be68945a0953ec94c Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:58:15 +0200
Subject: [PATCH 16/18] Restore the rest of the title handling options and make
@ -4927,7 +4929,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
8 files changed, 265 insertions(+), 78 deletions(-)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index aaa9e0e97ced..641e0203b045 100644
index a6b7673828e5..f9a7c730ada5 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -24,6 +24,13 @@
@ -4957,10 +4959,10 @@ index aaa9e0e97ced..641e0203b045 100644
<default l10n="messages" context="title">'Terminal'</default>
<summary>Title for terminal</summary>
diff --git a/src/preferences.ui b/src/preferences.ui
index 18f7e097e666..188f3c774b18 100644
index 2f1ba2811ca2..f67027fbfbda 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -1900,7 +1900,7 @@
@@ -1899,7 +1899,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@ -4969,7 +4971,7 @@ index 18f7e097e666..188f3c774b18 100644
<property name="use_underline">True</property>
<property name="mnemonic_widget">title-entry</property>
</object>
@@ -1920,6 +1920,37 @@
@@ -1919,6 +1919,37 @@
<property name="left_attach">1</property>
</packing>
</child>
@ -5047,10 +5049,10 @@ index bdd354e38360..731dcf2aaebc 100644
TERMINAL_EXIT_CLOSE,
TERMINAL_EXIT_RESTART,
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index f9222855b231..c5682c5eac83 100644
index 8b6b55be6188..d0f08f559387 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -66,6 +66,7 @@ G_BEGIN_DECLS
@@ -68,6 +68,7 @@ G_BEGIN_DECLS
#define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke"
#define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output"
#define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode"
@ -5059,7 +5061,7 @@ index f9222855b231..c5682c5eac83 100644
#define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command"
#define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 3a49baa07a3f..c6062d78edf6 100644
index a333e57097ef..9c9b29f48c83 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -89,13 +89,16 @@ struct _TerminalScreenPrivate
@ -5356,7 +5358,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
}
if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
@@ -1137,7 +1230,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
@@ -1144,7 +1237,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
g_object_unref (old_profile);
g_object_notify (G_OBJECT (screen), "profile");
@ -5364,7 +5366,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
}
GSettings*
@@ -1468,8 +1560,6 @@ spawn_result_cb (VteTerminal *terminal,
@@ -1475,8 +1567,6 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid;
@ -5373,7 +5375,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
if (error) {
GtkWidget *info_bar;
@@ -1781,33 +1871,45 @@ terminal_screen_focus_in (GtkWidget *widget,
@@ -1788,33 +1878,45 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
}
@ -5435,7 +5437,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
}
/**
@@ -1840,7 +1942,9 @@ static void
@@ -1847,7 +1949,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen)
{
@ -5446,7 +5448,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
}
static void
@@ -1863,8 +1967,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1870,8 +1974,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1;
@ -5455,7 +5457,7 @@ index 3a49baa07a3f..c6062d78edf6 100644
action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY);
switch (action)
@@ -1908,6 +2010,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1915,6 +2017,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
}
}
@ -5537,10 +5539,10 @@ index 7fda0fe5128e..6f81c7da4a66 100644
static void
--
2.20.1
2.23.0
From cf173a55962e57e4cec5d01baf75798492f01bf5 Mon Sep 17 00:00:00 2001
From ca168e8156e02ca4a324a7ba59ebc21940ddc4c0 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 3 Apr 2019 15:38:09 +0200
Subject: [PATCH 17/18] Update the title with the current foreground process
@ -5553,10 +5555,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 641e0203b045..ea0398b77dfe 100644
index f9a7c730ada5..88459d78adcf 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -254,6 +254,11 @@
@@ -264,6 +264,11 @@
<summary>Whether to scroll to the bottom when there’s new output</summary>
<description>If true, whenever there’s new output the terminal will scroll to the bottom.</description>
</key>
@ -5569,10 +5571,10 @@ index 641e0203b045..ea0398b77dfe 100644
<default>'close'</default>
<summary>What to do with the terminal when the child command exits</summary>
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index c5682c5eac83..c894b38e4eca 100644
index d0f08f559387..6203c9ed21fa 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -65,6 +65,7 @@ G_BEGIN_DECLS
@@ -67,6 +67,7 @@ G_BEGIN_DECLS
#define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy"
#define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke"
#define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output"
@ -5581,7 +5583,7 @@ index c5682c5eac83..c894b38e4eca 100644
#define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode"
#define TERMINAL_PROFILE_TITLE_KEY "title"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index c6062d78edf6..9b7a1b50f0c7 100644
index 9c9b29f48c83..4d6d057f7fda 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -97,7 +97,9 @@ struct _TerminalScreenPrivate
@ -5641,7 +5643,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY));
@@ -1032,6 +1051,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1039,6 +1058,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions);
}
@ -5651,7 +5653,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
g_object_thaw_notify (object);
}
@@ -1942,6 +1964,9 @@ static void
@@ -1949,6 +1971,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen)
{
@ -5661,7 +5663,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
terminal_screen_set_dynamic_title (screen,
vte_terminal_get_window_title (vte_terminal),
FALSE);
@@ -2048,6 +2073,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
@@ -2055,6 +2080,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
"Current foreground command-line: %s\n",
priv->current_cmdline);
@ -5670,7 +5672,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
out:
priv->contents_changed_source_id = 0;
return G_SOURCE_REMOVE;
@@ -2132,6 +2159,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -2139,6 +2166,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
TerminalScreen *screen = TERMINAL_SCREEN (terminal);
TerminalScreenPrivate *priv = screen->priv;
@ -5678,7 +5680,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
priv->between_preexec_and_precmd = FALSE;
if (priv->contents_changed_source_id != 0)
@@ -2150,6 +2178,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -2157,6 +2185,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
terminal_screen_show_notification (screen);
g_clear_pointer (&priv->current_cmdline, g_free);
@ -5686,7 +5688,7 @@ index c6062d78edf6..9b7a1b50f0c7 100644
}
static gboolean
@@ -2170,6 +2199,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
@@ -2177,6 +2206,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
"Current foreground command-line: %s\n",
priv->current_cmdline);
@ -5696,10 +5698,10 @@ index c6062d78edf6..9b7a1b50f0c7 100644
retval = G_SOURCE_REMOVE;
--
2.20.1
2.23.0
From 55eb6615160fc9694d970003a7136865efeabdef Mon Sep 17 00:00:00 2001
From 88e3d24c3580838c79d9f0aaad9caf9fbc132f46 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 18 Jun 2019 19:47:14 +0200
Subject: [PATCH 18/18] window: Preserve current toolbox, if any, when opening
@ -5752,5 +5754,5 @@ index 6f81c7da4a66..58f69ae9173d 100644
terminal_screen_get_initial_environment (priv->active_screen),
1.0);
--
2.20.1
2.23.0

12
gnome-terminal.spec
View File

@ -2,17 +2,17 @@
%define glib2_version 2.50.0
%define gtk3_version 3.22.27
%define vte_version 0.56.2
%define vte_version 0.57.90
%define desktop_file_utils_version 0.2.90
Name: gnome-terminal
Version: 3.32.2
Release: 3%{?dist}
Version: 3.33.90
Release: 1%{?dist}
Summary: Terminal emulator for GNOME
License: GPLv3+ and GFDL and LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/gnome-terminal/3.32/gnome-terminal-%{version}.tar.xz
Source0: http://download.gnome.org/sources/gnome-terminal/3.33/gnome-terminal-%{version}.tar.xz
Source1: org.gnome.Terminal.gschema.override
Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch
@ -106,6 +106,10 @@ make check
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Wed Sep 04 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
- Update to 3.33.90
- Rebase the patches
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-terminal-3.32.2.tar.xz) = 1be1e26b62b9364361982a34455fb5c818a2114edadb1146985f9e418ce5d51387d12b443c12022b8eec9c61c2137a1a780f390672406a1940f8b352b782e3cc
SHA512 (gnome-terminal-3.33.90.tar.xz) = 0540868adc60b3c777219a10138273942d46579c07edf6ea3345fd0c0d774eacf6bde0ef8999a2e662dfd05264b3f44594fcccd6b46506475f8640dd5677a87e