Update to 3.36.1.1

- Rebase the patches
2020-04-06 16:31:58 +02:00 · 2020-04-06 16:31:58 +02:00 · bb5f88b61f
commit bb5f88b61f
parent 592190a670
4 changed files with 55 additions and 39 deletions
--- a/.gitignore
+++ b/.gitignore
@ -98,3 +98,4 @@ gnome-terminal-2.31.3.tar.bz2
 /gnome-terminal-3.35.92.tar.xz
 /gnome-terminal-3.36.0.1.tar.xz
 /gnome-terminal-3.36.1.tar.xz
+/gnome-terminal-3.36.1.1.tar.xz
--- a/gnome-terminal-cntr-ntfy-autottl-ts.patch
+++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch
@ -1,4 +1,4 @@
-From 991b2dfa144953995c118d0c2e80667afdbc3afa Mon Sep 17 00:00:00 2001
+From 81806dda39f0c8c42f009534f0f7c8ea2adbe263 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,7 +152,7 @@ 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 f1475c41ab11..5d6d4a821af3 100644
+index 33fbb5dfbdb9..1a6ec56f8f5f 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -1058,7 +1058,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
@ -234,7 +234,7 @@ index 7a8953c50388..a3d77bf6719d 100644
 2.24.1


-From 57777887187d0030f774ba4561f8b26d00b2dba5 Mon Sep 17 00:00:00 2001
+From d28e50c368947701929b7572a2227e03683fa4d5 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 260aae47d4e4bb763ea0c6b282730854a02dda8b Mon Sep 17 00:00:00 2001
+From edcd4a939930d43593266632962ca7ec80a57cc1 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 5d6d4a821af3..e19378fb1cd0 100644
+index 1a6ec56f8f5f..5b5556cd8b2f 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -154,6 +154,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@ -431,7 +431,7 @@ index 36d155a9e420..c0219d872725 100644
 2.24.1


-From 11d4c0d5c4c2e35fca624bd5d9f6dae5762429c5 Mon Sep 17 00:00:00 2001
+From 2b2eccb051d01c6ab946bdc06af389347b17f223 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 e19378fb1cd0..4d8e4325da1b 100644
+index 5b5556cd8b2f..64600e7c3eef 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 e19378fb1cd0..4d8e4325da1b 100644
 2.24.1


-From dfb00823fba51c62c6713f29c14ba9039069a9fa Mon Sep 17 00:00:00 2001
+From 305bebdea811a65da0bb901198e8842aa1f5308f 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 4d8e4325da1b..6e09e0de2702 100644
+index 64600e7c3eef..ec2de21b76d0 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -110,6 +110,11 @@ struct _TerminalScreenPrivate
@ -754,7 +754,7 @@ index 4d8e4325da1b..6e09e0de2702 100644
 2.24.1


-From 82e4fd64b65c9f9acf2d7bb3536101b4de554ceb Mon Sep 17 00:00:00 2001
+From a9560cd5e73b25536ea4417c7fd9accc564a018e 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 0465fca5f7be..5ba3f0aa47e8 100644
+index 6ac5290ab887..81196250dbbc 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 6e09e0de2702..c815647c7443 100644
+index ec2de21b76d0..bb3903e6f888 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 c671c36f1aa3315d3dfdb7f0fbf15212bea22a35 Mon Sep 17 00:00:00 2001
+From 142baf4c629fca34a43694d65b5d77df8a9ee680 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 0a8b1c9df58f91db92807222fc229c4d799bb4ec Mon Sep 17 00:00:00 2001
+From 0a541803b51597536b40a89bd79cda12d7d241c7 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 31e3205c60556026bd76b5de6daf1de60719a052 Mon Sep 17 00:00:00 2001
+From 1b74aab4dc06705c2097630188e98cee3c3345f8 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 c815647c7443..3f1920965019 100644
+index bb3903e6f888..16d2ef49eef6 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -114,6 +114,7 @@ struct _TerminalScreenPrivate
@ -1839,7 +1839,7 @@ index 8ea337867222..049bbe5a2b8b 100644
 2.24.1


-From 8baa264bd78877377c60a91e6c11243ba3bb8646 Mon Sep 17 00:00:00 2001
+From 3cc854c356fcc7fbc74e2b7e0b9a0c7fdf9156bd 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,7 +1983,7 @@ 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 3f1920965019..150291257118 100644
+index 16d2ef49eef6..63cc33a2b29c 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -1057,11 +1057,14 @@ char *
@ -2018,7 +2018,7 @@ index 3f1920965019..150291257118 100644
 2.24.1


-From 86259b0bdcb9907bc3e14d02158458640199bb21 Mon Sep 17 00:00:00 2001
+From 441a3383dab6b081eddd5a46f41d938d0f5aa8d3 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
@ -4762,7 +4762,7 @@ index 0ef3bb80be49..5c162706fa7b 100644
 2.24.1


-From e38bcccc3e15255302254ceb2c251246deba7e99 Mon Sep 17 00:00:00 2001
+From 17af27d64f5a742d8ea5e92943e75d0bbd02146e 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
@ -4910,7 +4910,7 @@ index c0219d872725..61c5e7de350a 100644
 2.24.1


-From e9739e0dcdfa27f7867a918cee65045aae8f4185 Mon Sep 17 00:00:00 2001
+From 336539b56a4170708430335493d1f4e3fa9cca2d 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
@ -4924,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 150291257118..bf67bf95455e 100644
+index 63cc33a2b29c..d0e0d55d04a9 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -833,7 +833,7 @@ terminal_screen_new (GSettings       *profile,
@ -4940,7 +4940,7 @@ index 150291257118..bf67bf95455e 100644
 2.24.1


-From 870c9faedf5cdb21e28cc0740b3aceddc3adf506 Mon Sep 17 00:00:00 2001
+From d2dee809878101cf499ad9b7bfe55e94ef842a75 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
@ -5094,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 bf67bf95455e..9e484e670f6f 100644
+index d0e0d55d04a9..d41c6da1070d 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -113,8 +113,11 @@ struct _TerminalScreenPrivate
@ -5557,7 +5557,7 @@ index 61c5e7de350a..0d61db3c125d 100644
 2.24.1


-From 2ad31966949a4cd96283e77e8a005a0eb38a8b30 Mon Sep 17 00:00:00 2001
+From b7ab781c8334f4aa0c855277ff8ede80195a87a6 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
@ -5600,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 9e484e670f6f..61fc255dac9f 100644
+index d41c6da1070d..2857de003753 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
@@ -112,7 +112,9 @@ struct _TerminalScreenPrivate
@ -5724,7 +5724,7 @@ index 9e484e670f6f..61fc255dac9f 100644
 2.24.1


-From 5d318a9ae11e0be1966519abc39f5e861cc041c2 Mon Sep 17 00:00:00 2001
+From 5a93d207f36fa2c115a98d97c11ec49a2512f3a4 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
@ -5734,20 +5734,25 @@ advertises the name of the current toolbox container.

 https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
 ---
- src/terminal-screen.c | 25 ++++++++++++++++++++++++-
+ src/terminal-screen.c | 37 ++++++++++++++++++++++++++++++++++---
 src/terminal-screen.h |  6 ++++++
 src/terminal-window.c | 26 ++++++++++++++++++++++++--
- 3 files changed, 54 insertions(+), 3 deletions(-)
+ 3 files changed, 64 insertions(+), 5 deletions(-)

 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 61fc255dac9f..059e2b0617ff 100644
+index 2857de003753..6ffcfe575754 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -877,6 +877,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
+@@ -877,6 +877,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
                                     TerminalScreen *parent_screen,
                                     GCancellable *cancellable,
                                     GError **error)
 +{
+  _terminal_debug_print (TERMINAL_DEBUG_PROCESSES,
+                         "[screen %p] reexec_from_screen: parent:%p\n",
+                         screen,
+                         parent_screen);
+
 +  return terminal_screen_reexec_from_screen_with_override_command (screen,
 +                                                                   parent_screen,
 +                                                                   NULL,
@ -5764,9 +5769,9 @@ index 61fc255dac9f..059e2b0617ff 100644
 {
   g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
 
-@@ -885,6 +899,15 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
+@@ -887,15 +906,27 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
 
-   g_return_val_if_fail (TERMINAL_IS_SCREEN (parent_screen), FALSE);
+   gs_free char* cwd = terminal_screen_get_current_dir (parent_screen);
 
 +  terminal_unref_exec_data ExecData* data = NULL;
 +  if (override_command != NULL)
@ -5775,20 +5780,26 @@ index 61fc255dac9f..059e2b0617ff 100644
 +
 +      g_strfreev (data->argv);
 +      data->argv = g_strdupv (override_command);
+
+      g_free (data->cwd);
+      data->cwd = g_strdup (cwd);
 +    }
 +
-   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,
+-                         "[screen %p] reexec_from_screen: parent:%p cwd:%s\n",
+                         "[screen %p] reexec_from_screen_with_override_command: parent:%p cwd:%s\n",
+                          screen,
+                          parent_screen,
                          cwd);
 
   return terminal_screen_reexec_from_exec_data (screen,
 -                                                NULL /* exec data */,
+-                                                NULL /* envv */,
 +                                                data,
-                                                 NULL /* envv */,
+                                                parent_screen->priv->exec_data->envv,
                                                 cwd,
                                                 cancellable,
+                                                 error);
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
 index 5b7fcc59ddd0..5b1f983a7049 100644
 --- a/src/terminal-screen.h
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@ -7,7 +7,7 @@
 %define desktop_file_utils_version 0.2.90

 Name: gnome-terminal
-Version: 3.36.1
+Version: 3.36.1.1
 Release: 1%{?dist}
 Summary: Terminal emulator for GNOME

@ -106,6 +106,10 @@ make check
 %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml

 %changelog
+* Mon Apr 06 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1.1-1
+- Update to 3.36.1.1
+- Rebase the patches
+
 * Sun Apr 05 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.36.1-1
 - Update to 3.36.1
 - Rebase the patches
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gnome-terminal-3.36.1.tar.xz) = f1332634589c35715cd81a13ac389a014680da0a831abe3ef3a2d1bcb4b3d737c80f929dda00dd98f0f97b5c736b8198207b50dbf0cdc0176dc250470239df20
+SHA512 (gnome-terminal-3.36.1.1.tar.xz) = 86d5e050a0e5dff44864aaa9acc98f95203d9d55195c2ff4864aa98eaad77abd6b31e0e36d6cb15d383cddff84c22996a9b21d87be68551b3add50d7010c4129