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

Update to 3.36.1

Browse Source 
- Rebase the patches
This commit is contained in:
Debarshi Ray 2020-04-05 22:11:49 +02:00
parent b840158827
commit 592190a670
4 changed files with 121 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -97,3 +97,4 @@ gnome-terminal-2.31.3.tar.bz2
/gnome-terminal-3.35.91.tar.xz
/gnome-terminal-3.35.92.tar.xz
/gnome-terminal-3.36.0.1.tar.xz
/gnome-terminal-3.36.1.tar.xz

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

@ -1,4 +1,4 @@
From 8179539a9e51b455bb1bafdeece1dfdcc18fd85e Mon Sep 17 00:00:00 2001
From 991b2dfa144953995c118d0c2e80667afdbc3afa 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/16] Restore transparency
@ -152,10 +152,10 @@ index 05e9f8198549..c9e7c895d700 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 dc9f84471867..29d72df8883c 100644
index f1475c41ab11..5d6d4a821af3 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1059,7 +1059,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1058,7 +1058,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) ||
@ -166,7 +166,7 @@ index dc9f84471867..29d72df8883c 100644
update_color_scheme (screen);
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
@@ -1140,6 +1142,8 @@ update_color_scheme (TerminalScreen *screen)
@@ -1139,6 +1141,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 dc9f84471867..29d72df8883c 100644
gboolean use_theme_colors;
context = gtk_widget_get_style_context (widget);
@@ -1183,6 +1187,18 @@ update_color_scheme (TerminalScreen *screen)
@@ -1182,6 +1186,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 dc9f84471867..29d72df8883c 100644
vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
colors, n_colors);
vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
@@ -1190,6 +1206,10 @@ update_color_scheme (TerminalScreen *screen)
@@ -1189,6 +1205,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);
@ -234,7 +234,7 @@ index 7a8953c50388..a3d77bf6719d 100644
2.24.1
From 04bfcefd7f23d45e4cbdc74391bcdca44ee7f49a Mon Sep 17 00:00:00 2001
From 57777887187d0030f774ba4561f8b26d00b2dba5 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/16] window: Make the drawing robust across all themes
@ -296,7 +296,7 @@ index a3d77bf6719d..36d155a9e420 100644
2.24.1
From 676d1b2e13c497d0380eb7fd7c0c5a426ef96f1b Mon Sep 17 00:00:00 2001
From 260aae47d4e4bb763ea0c6b282730854a02dda8b 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/16] screen, window: Extra padding around transparent
@ -309,7 +309,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
2 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 29d72df8883c..92b0053de763 100644
index 5d6d4a821af3..e19378fb1cd0 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -154,6 +154,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@ -329,7 +329,7 @@ index 29d72df8883c..92b0053de763 100644
terminal_class->child_exited = terminal_screen_child_exited;
@@ -1127,6 +1130,32 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1126,6 +1129,32 @@ terminal_screen_profile_changed_cb (GSettings *profile,
g_object_thaw_notify (object);
}
@ -362,7 +362,7 @@ index 29d72df8883c..92b0053de763 100644
static void
update_color_scheme (TerminalScreen *screen)
{
@@ -1142,7 +1171,6 @@ update_color_scheme (TerminalScreen *screen)
@@ -1141,7 +1170,6 @@ update_color_scheme (TerminalScreen *screen)
GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
GtkStyleContext *context;
@ -370,7 +370,7 @@ index 29d72df8883c..92b0053de763 100644
gboolean transparent;
gboolean use_theme_colors;
@@ -1207,9 +1235,7 @@ update_color_scheme (TerminalScreen *screen)
@@ -1206,9 +1234,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);
@ -431,7 +431,7 @@ index 36d155a9e420..c0219d872725 100644
2.24.1
From d426caa428a0e7dc804e91b5d6f0797971c5fdfb Mon Sep 17 00:00:00 2001
From 11d4c0d5c4c2e35fca624bd5d9f6dae5762429c5 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 18 May 2018 20:15:34 +0200
Subject: [PATCH 04/16] screen: Try harder to find a foreground process group
@ -457,7 +457,7 @@ 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 92b0053de763..f3b89b09742f 100644
index e19378fb1cd0..4d8e4325da1b 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -2378,7 +2378,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
@ -501,7 +501,7 @@ index 92b0053de763..f3b89b09742f 100644
2.24.1
From e504c86566657e3fcffcf2d75211c7e982ba7a83 Mon Sep 17 00:00:00 2001
From dfb00823fba51c62c6713f29c14ba9039069a9fa Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 3 May 2018 16:49:28 +0200
Subject: [PATCH 05/16] screen: Track the current foreground process
@ -549,7 +549,7 @@ index 0fafcc3a846c..b0f2fc9df7f6 100644
void _terminal_debug_init(void);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index f3b89b09742f..6fc6ad470102 100644
index 4d8e4325da1b..6e09e0de2702 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -110,6 +110,11 @@ struct _TerminalScreenPrivate
@ -754,7 +754,7 @@ index f3b89b09742f..6fc6ad470102 100644
2.24.1
From 1a87e8628848dda2f76fef59c2b85275efe3d42c Mon Sep 17 00:00:00 2001
From 82e4fd64b65c9f9acf2d7bb3536101b4de554ceb Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 10 May 2018 19:23:16 +0200
Subject: [PATCH 06/16] Notify when a long-running foreground process group
@ -776,7 +776,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
5 files changed, 177 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6aa06fd5dece..460fefdbdc72 100644
index 0465fca5f7be..5ba3f0aa47e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,9 @@ AM_GNU_GETTEXT([external])
@ -850,7 +850,7 @@ index 6a4fe03f2756..4e70facf9a43 100644
app_load_css (application);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 6fc6ad470102..87bba46f0660 100644
index 6e09e0de2702..c815647c7443 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -54,6 +54,7 @@
@ -1092,7 +1092,7 @@ index 20cfbceb36b0..a987025e0524 100644
2.24.1
From de7db38f51445e4add69265146f801c34f9ffadc Mon Sep 17 00:00:00 2001
From c671c36f1aa3315d3dfdb7f0fbf15212bea22a35 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 15:39:35 +0200
Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids
@ -1367,7 +1367,7 @@ index 6526c4ff4832..0fc1c867d42e 100644
2.24.1
From b1ef026d7ab17997082e8d964e843088b8763a37 Mon Sep 17 00:00:00 2001
From 0a8b1c9df58f91db92807222fc229c4d799bb4ec Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 16:01:51 +0200
Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading"
@ -1660,7 +1660,7 @@ index 0fc1c867d42e..70c9e6ad0bad 100644
2.24.1
From 2148436a9e66fe18bbb672ef4dcbd0b653b358d7 Mon Sep 17 00:00:00 2001
From 31e3205c60556026bd76b5de6daf1de60719a052 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:02:13 +0200
Subject: [PATCH 09/16] Revert "screen: Remove unused description and
@ -1675,7 +1675,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 87bba46f0660..bf6695b69a43 100644
index c815647c7443..3f1920965019 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -114,6 +114,7 @@ struct _TerminalScreenPrivate
@ -1734,7 +1734,7 @@ index 87bba46f0660..bf6695b69a43 100644
G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
}
@@ -1040,6 +1054,21 @@ terminal_screen_get_title (TerminalScreen *screen)
@@ -1039,6 +1053,21 @@ terminal_screen_get_title (TerminalScreen *screen)
return vte_terminal_get_window_title (VTE_TERMINAL (screen));
}
@ -1756,7 +1756,7 @@ index 87bba46f0660..bf6695b69a43 100644
static void
terminal_screen_profile_changed_cb (GSettings *profile,
const char *prop_name,
@@ -1364,6 +1393,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
@@ -1363,6 +1392,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
g_object_unref (old_profile);
g_object_notify (G_OBJECT (screen), "profile");
@ -1839,7 +1839,7 @@ index 8ea337867222..049bbe5a2b8b 100644
2.24.1
From 0452dd80309b71846c293e192314c65c197408f8 Mon Sep 17 00:00:00 2001
From 8baa264bd78877377c60a91e6c11243ba3bb8646 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 17:39:48 +0200
Subject: [PATCH 10/16] Revert "Remove the static title setting from profile
@ -1983,10 +1983,10 @@ index c9e7c895d700..a52bfdb1b5c3 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 bf6695b69a43..c5683799aabf 100644
index 3f1920965019..150291257118 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1058,11 +1058,14 @@ char *
@@ -1057,11 +1057,14 @@ char *
terminal_screen_get_description (TerminalScreen *screen)
{
TerminalScreenPrivate *priv = screen->priv;
@ -2001,7 +2001,7 @@ index bf6695b69a43..c5683799aabf 100644
return g_strdup_printf ("%s — %d",
title && title[0] ? title : _("Terminal"),
@@ -1108,6 +1111,12 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1107,6 +1110,12 @@ terminal_screen_profile_changed_cb (GSettings *profile,
vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width);
}
@ -2018,7 +2018,7 @@ index bf6695b69a43..c5683799aabf 100644
2.24.1
From 9b9d2dca0b998a1e5076225a764621e7aea14714 Mon Sep 17 00:00:00 2001
From 86259b0bdcb9907bc3e14d02158458640199bb21 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 17:06:17 +0100
Subject: [PATCH 11/16] Restore translations for setting a title and
@ -2110,14 +2110,14 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/th.po | 20 ++++++++++----------
po/tr.po | 12 ++++++++++++
po/ug.po | 4 ++--
po/uk.po | 19 +++++++++++--------
po/uk.po | 15 +++++++++++++++
po/vi.po | 15 +++++++++------
po/wa.po | 12 ++++++------
po/xh.po | 12 ++++++------
po/zh_CN.po | 15 +++++++++------
po/zh_HK.po | 15 +++++++++------
po/zh_TW.po | 15 +++++++++------
92 files changed, 715 insertions(+), 351 deletions(-)
92 files changed, 719 insertions(+), 343 deletions(-)
diff --git a/po/am.po b/po/am.po
index 3445d96da657..ee992f0712a5 100644
@ -2514,7 +2514,7 @@ index a6e8fb4250dc..c9ed8508228d 100644
+msgid "Set Title"
+msgstr "Estableix el títol"
diff --git a/po/cs.po b/po/cs.po
index bbb3fd679c8a..98125e7209aa 100644
index d592ea40910c..7e394112d4a6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2297,3 +2297,15 @@ msgstr ""
@ -2580,10 +2580,10 @@ index 31d145f37174..ebfaaae38ecf 100644
+msgid "Transparent background"
+msgstr "Gennemsigtig baggrund"
diff --git a/po/de.po b/po/de.po
index 4d5852c2f0b1..868326bba955 100644
index a5f4846745e9..8d9a3bb05d49 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2384,3 +2384,15 @@ msgstr "Fenster _schließen"
@@ -2507,3 +2507,15 @@ msgstr "Fenster _schließen"
#~ msgid "_Quit"
#~ msgstr "_Beenden"
@ -3143,7 +3143,7 @@ index 2d7dc5b14008..8d3d0529df61 100644
#~ msgid "S/Key Challenge Response"
#~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
diff --git a/po/hr.po b/po/hr.po
index 4bbb3629a82a..a440505c5203 100644
index 881b7cc7f3f3..3d2cba35a617 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2710,3 +2710,13 @@ msgstr "_Zatvori prozor"
@ -3267,11 +3267,11 @@ index 69608253837f..87d927431d7a 100644
+msgid "Set Title"
+msgstr "タイトルを設定する"
diff --git a/po/ka.po b/po/ka.po
index 2a0bc91fad40..c289e30eb4fa 100644
index e0dd79f280a2..887d395ce150 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -219,8 +219,8 @@ msgid "<b>Background</b>"
msgstr "b>ფონი</b>"
msgstr "<b>ფონი</b>"
#: ../src/gnome-terminal.glade2.h:3
-msgid "<b>Command</b>"
@ -3971,10 +3971,10 @@ index d5f10e4f2cbd..cd2f908fb579 100644
+msgid "Transparent background"
+msgstr "Fundo transparente"
diff --git a/po/ro.po b/po/ro.po
index 6fcd5af03629..cdf6100c8dd3 100644
index e76d6df41aae..49fd8401e70d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3376,8 +3376,8 @@ msgstr "Î_nchide fereastra"
@@ -3484,8 +3484,8 @@ msgstr "Î_nchide fereastra"
#~ msgid "_Solid color"
#~ msgstr "Culoare _solidă"
@ -4057,10 +4057,10 @@ index adca7d5acba9..6379cee7f0a3 100644
#: ../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 baf4db0fe376..7b4ce4bfd9bc 100644
index 06ffff4ee055..ab62c01f8f85 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2959,3 +2959,15 @@ msgstr "_Zavrieť okno"
@@ -3048,3 +3048,15 @@ msgstr "_Zavrieť okno"
#~ "\n"
#~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
#~ "help“.\n"
@ -4513,54 +4513,28 @@ index 313f76b98eae..be6089762082 100644
#~ 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 eac987c92a7a..10ad3394f4ec 100644
index a7eb5ab5b9c1..9c6667ba0399 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2647,11 +2647,11 @@ msgstr "Закр_ити вікно"
#~ msgid "Default size:"
#~ msgstr "Типовий розмір:"
-#~ msgid "Title"
-#~ msgstr "Заголовок"
@@ -2399,3 +2399,18 @@ msgstr ""
#: src/terminal-window.c:3224
msgid "C_lose Window"
msgstr "Закр_ити вікно"
+
+msgid "Title"
+msgstr "Заголовок"
-#~ msgid "_Title:"
-#~ msgstr "За_головок:"
+
+msgid "_Title:"
+msgstr "За_головок:"
#~ msgid "Title and Command"
#~ msgstr "Заголовок та команда"
@@ -2659,12 +2659,15 @@ msgstr "Закр_ити вікно"
#~ msgid "_Unlimited"
#~ msgstr "_Нескінченно"
-#~ msgid "Set Title"
-#~ msgstr "Встановлення заголовка"
+
+msgid "Set Title"
+msgstr "Встановлення заголовка"
#~ msgid "Current Locale"
#~ msgstr "Теперішня локаль"
+
+msgid "_Set Title…"
+msgstr "_Встановити заголовок…"
+
#~ msgid "What to do with dynamic title"
#~ msgstr "Що робити з динамічним заголовком"
@@ -3398,8 +3401,8 @@ msgstr "Закр_ити вікно"
#~ msgid "_Solid color"
#~ msgstr "_Суцільний колір"
-#~ msgid "_Transparent background"
-#~ msgstr "П_розоре тло"
+msgid "Transparent background"
+msgstr "Прозоре тло"
#~ msgid "Switch to Tab 3"
#~ msgstr "До вкладки 3"
diff --git a/po/vi.po b/po/vi.po
index d5f27612f4be..8bb576b6d875 100644
--- a/po/vi.po
@ -4606,7 +4580,7 @@ index d5f27612f4be..8bb576b6d875 100644
+msgid "Transparent background"
+msgstr "Nền trong suốt"
diff --git a/po/wa.po b/po/wa.po
index 0e0a6a752b6d..5ddeb2393654 100644
index 2a29945bbc74..4f1c57c71e94 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -224,8 +224,8 @@ msgid "<b>Background</b>"
@ -4643,7 +4617,7 @@ index 0e0a6a752b6d..5ddeb2393654 100644
#: ../src/terminal-window.c:1020
msgid "Set _Character Encoding"
diff --git a/po/xh.po b/po/xh.po
index 44a8e21c7842..12aa6d190d99 100644
index cb78ec67db2d..a4f3b4ddcfb6 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -217,8 +217,8 @@ msgid "<b>Background</b>"
@ -4788,7 +4762,7 @@ index 0ef3bb80be49..5c162706fa7b 100644
2.24.1
From 988dddd6e721f5e27739e6f532c5b2df58c7ef5f Mon Sep 17 00:00:00 2001
From e38bcccc3e15255302254ceb2c251246deba7e99 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 25 May 2016 13:47:36 +0200
Subject: [PATCH 12/16] Restore the action and shortcut to set a static title
@ -4936,7 +4910,7 @@ index c0219d872725..61c5e7de350a 100644
2.24.1
From 27fdb979b94fdf68312a2778bceb48755717c327 Mon Sep 17 00:00:00 2001
From e9739e0dcdfa27f7867a918cee65045aae8f4185 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 18:14:36 +0200
Subject: [PATCH 13/16] screen: Style fix
@ -4950,7 +4924,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 c5683799aabf..92e01c5d6bee 100644
index 150291257118..bf67bf95455e 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -833,7 +833,7 @@ terminal_screen_new (GSettings *profile,
@ -4966,7 +4940,7 @@ index c5683799aabf..92e01c5d6bee 100644
2.24.1
From 1dfa02ba9835ab5884e48d63d27d398468f07933 Mon Sep 17 00:00:00 2001
From 870c9faedf5cdb21e28cc0740b3aceddc3adf506 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:58:15 +0200
Subject: [PATCH 14/16] Restore the rest of the title handling options and make
@ -5120,7 +5094,7 @@ index a52bfdb1b5c3..d03c983ed858 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 92e01c5d6bee..5db513d0c26f 100644
index bf67bf95455e..9e484e670f6f 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -113,8 +113,11 @@ struct _TerminalScreenPrivate
@ -5244,7 +5218,7 @@ index 92e01c5d6bee..5db513d0c26f 100644
vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom);
terminal_screen_set_font (screen);
@@ -1048,28 +1029,139 @@ terminal_screen_exec (TerminalScreen *screen,
@@ -1047,28 +1028,139 @@ terminal_screen_exec (TerminalScreen *screen,
return TRUE;
}
@ -5395,7 +5369,7 @@ index 92e01c5d6bee..5db513d0c26f 100644
}
static void
@@ -1112,9 +1204,10 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1111,9 +1203,10 @@ terminal_screen_profile_changed_cb (GSettings *profile,
}
if (!prop_name ||
@ -5407,7 +5381,7 @@ index 92e01c5d6bee..5db513d0c26f 100644
}
if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
@@ -1402,7 +1495,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
@@ -1401,7 +1494,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
g_object_unref (old_profile);
g_object_notify (G_OBJECT (screen), "profile");
@ -5583,7 +5557,7 @@ index 61c5e7de350a..0d61db3c125d 100644
2.24.1
From a959c7d45d91d25e1627e2e9f83a2d905393dad9 Mon Sep 17 00:00:00 2001
From 2ad31966949a4cd96283e77e8a005a0eb38a8b30 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 3 Apr 2019 15:38:09 +0200
Subject: [PATCH 15/16] Update the title with the current foreground process
@ -5626,7 +5600,7 @@ index d03c983ed858..8d8b34fdbbab 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 5db513d0c26f..575797e30f38 100644
index 9e484e670f6f..61fc255dac9f 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -112,7 +112,9 @@ struct _TerminalScreenPrivate
@ -5639,7 +5613,7 @@ index 5db513d0c26f..575797e30f38 100644
gboolean user_title; /* title was manually set */
char *current_cmdline;
char *raw_title;
@@ -1144,6 +1146,20 @@ terminal_screen_format_title (TerminalScreen *screen,
@@ -1143,6 +1145,20 @@ terminal_screen_format_title (TerminalScreen *screen,
add_sep = FALSE;
}
@ -5660,7 +5634,7 @@ index 5db513d0c26f..575797e30f38 100644
if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0)
{
g_free (*titleptr);
@@ -1173,6 +1189,7 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1172,6 +1188,7 @@ terminal_screen_profile_changed_cb (GSettings *profile,
GObject *object = G_OBJECT (screen);
VteTerminal *vte_terminal = VTE_TERMINAL (screen);
TerminalWindow *window;
@ -5668,7 +5642,7 @@ index 5db513d0c26f..575797e30f38 100644
g_object_freeze_notify (object);
@@ -1207,7 +1224,7 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1206,7 +1223,7 @@ terminal_screen_profile_changed_cb (GSettings *profile,
prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) ||
prop_name == I_(TERMINAL_PROFILE_TITLE_KEY))
{
@ -5677,7 +5651,7 @@ index 5db513d0c26f..575797e30f38 100644
}
if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
@@ -1235,6 +1252,13 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1234,6 +1251,13 @@ terminal_screen_profile_changed_cb (GSettings *profile,
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
update_color_scheme (screen);
@ -5691,7 +5665,7 @@ index 5db513d0c26f..575797e30f38 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));
@@ -1295,6 +1319,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@@ -1294,6 +1318,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions);
}
@ -5750,7 +5724,7 @@ index 5db513d0c26f..575797e30f38 100644
2.24.1
From 1d730a98b60399fa733321a9bf5d1c36fe8e8e6e Mon Sep 17 00:00:00 2001
From 5d318a9ae11e0be1966519abc39f5e861cc041c2 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 27 Feb 2020 19:32:08 +0100
Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any
@ -5760,71 +5734,83 @@ advertises the name of the current toolbox container.
https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
---
src/terminal-screen.c | 20 ++++++++++++++++++++
src/terminal-screen.c | 25 ++++++++++++++++++++++++-
src/terminal-screen.h | 6 ++++++
src/terminal-window.c | 22 ++++++++++++++++++++--
3 files changed, 46 insertions(+), 2 deletions(-)
src/terminal-window.c | 26 ++++++++++++++++++++++++--
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 575797e30f38..cd7e19215fea 100644
index 61fc255dac9f..059e2b0617ff 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -876,6 +876,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
@@ -877,6 +877,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
TerminalScreen *parent_screen,
GCancellable *cancellable,
GError **error)
+{
+ return terminal_screen_reexec_from_screen_with_override_title (screen,
+ parent_screen,
+ NULL,
+ cancellable,
+ error);
+ return terminal_screen_reexec_from_screen_with_override_command (screen,
+ parent_screen,
+ NULL,
+ cancellable,
+ error);
+}
+
+gboolean
+terminal_screen_reexec_from_screen_with_override_title (TerminalScreen *screen,
+ TerminalScreen *parent_screen,
+ char **override_title,
+ GCancellable *cancellable,
+ GError **error)
+terminal_screen_reexec_from_screen_with_override_command (TerminalScreen *screen,
+ TerminalScreen *parent_screen,
+ char **override_command,
+ GCancellable *cancellable,
+ GError **error)
{
g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
@@ -885,6 +899,12 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
@@ -885,6 +899,15 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
g_return_val_if_fail (TERMINAL_IS_SCREEN (parent_screen), FALSE);
terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data);
+ if (override_title != NULL)
+ terminal_unref_exec_data ExecData* data = NULL;
+ if (override_command != NULL)
+ {
+ data = exec_data_clone (parent_screen->priv->exec_data);
+
+ g_strfreev (data->argv);
+ data->argv = g_strdupv (override_title);
+ data->argv = g_strdupv (override_command);
+ }
+
gs_free char* cwd = terminal_screen_get_current_dir (parent_screen);
_terminal_debug_print (TERMINAL_DEBUG_PROCESSES,
@@ -894,7 +917,7 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
cwd);
return terminal_screen_reexec_from_exec_data (screen,
- NULL /* exec data */,
+ data,
NULL /* envv */,
cwd,
cancellable,
diff --git a/src/terminal-screen.h b/src/terminal-screen.h
index 5b7fcc59ddd0..aca2ddd70820 100644
index 5b7fcc59ddd0..5b1f983a7049 100644
--- a/src/terminal-screen.h
+++ b/src/terminal-screen.h
@@ -108,6 +108,12 @@ gboolean terminal_screen_reexec_from_screen (TerminalScreen *screen,
GCancellable *cancellable,
GError **error);
+gboolean terminal_screen_reexec_from_screen_with_override_title (TerminalScreen *screen,
+ TerminalScreen *parent_screen,
+ char **override_title,
+ GCancellable *cancellable,
+ GError **error);
+gboolean terminal_screen_reexec_from_screen_with_override_command (TerminalScreen *screen,
+ TerminalScreen *parent_screen,
+ char **override_command,
+ GCancellable *cancellable,
+ GError **error);
+
void terminal_screen_set_profile (TerminalScreen *screen,
GSettings *profile);
GSettings* terminal_screen_get_profile (TerminalScreen *screen);
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 0d61db3c125d..9bb3faac6ad9 100644
index 0d61db3c125d..ad3a95af7008 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -405,8 +405,26 @@ action_new_terminal_cb (GSimpleAction *action,
@@ -405,8 +405,30 @@ action_new_terminal_cb (GSimpleAction *action,
terminal_window_switch_screen (window, screen);
gtk_widget_grab_focus (GTK_WIDGET (screen));
@ -5843,7 +5829,11 @@ index 0d61db3c125d..9bb3faac6ad9 100644
+ g_printerr ("Failed to parse '%s': %s\n", override_command_str, error->message);
+
+ /* Start child process, if possible by using the same args as the parent screen */
+ terminal_screen_reexec_from_screen_with_override_title (screen, parent_screen, override_command, NULL, NULL);
+ terminal_screen_reexec_from_screen_with_override_command (screen,
+ parent_screen,
+ override_command,
+ NULL,
+ NULL);
+ }
+ else
+ {

8
gnome-terminal.spec
View File

@ -3,11 +3,11 @@
%global gettext_version 0.19.8
%define glib2_version 2.52.0
%define gtk3_version 3.22.27
%define vte_version 0.60.0
%define vte_version 0.60.1
%define desktop_file_utils_version 0.2.90
Name: gnome-terminal
Version: 3.36.0.1
Version: 3.36.1
Release: 1%{?dist}
Summary: Terminal emulator for GNOME
@ -106,6 +106,10 @@ make check
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Sun Apr 05 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1-1
- Update to 3.36.1
- Rebase the patches
* Fri Mar 06 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.0.1-1
- Update to 3.36.0.1

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-terminal-3.36.0.1.tar.xz) = 6bb71e1ef24e90f08eaa946599e4b87a0685d4bc2c37af0b9b4539b3b7787b704f74e5509cdfbf974b23cbcb725b4f06ecdd7c144f4b64e728f9979a2d09fd8c
SHA512 (gnome-terminal-3.36.1.tar.xz) = f1332634589c35715cd81a13ac389a014680da0a831abe3ef3a2d1bcb4b3d737c80f929dda00dd98f0f97b5c736b8198207b50dbf0cdc0176dc250470239df20