Update the downstream patches to include a soft assertion
https://bugzilla.redhat.com/show_bug.cgi?id=1833756
This commit is contained in:
Debarshi Ray
parent
6a2bc659a7
commit
6486f6800b
@ -1,4 +1,4 @@
|
||||
From 70c75d16f4124b9ee8f219b9ce42e25d1a52d81d Mon Sep 17 00:00:00 2001
|
||||
From 2c637b70285d9fd53e75e873b35fa3cac1964729 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
|
||||
@ -231,10 +231,10 @@ index 537cd2e1d8b1..d87bbb6f24ec 100644
|
||||
uuid_unparse (u, uuidstr);
|
||||
priv->uuid = g_strdup (uuidstr);
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From b25b0df8b4a9f1e5c9d071ca747bce01cb3f6466 Mon Sep 17 00:00:00 2001
|
||||
From b956e0801252cc8c62cbe05237fe36ae3ef7b5d9 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
|
||||
@ -293,10 +293,10 @@ index d87bbb6f24ec..c79e06387c94 100644
|
||||
widget_class->screen_changed = terminal_window_screen_changed;
|
||||
widget_class->style_updated = terminal_window_style_updated;
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 723cff566e0f1f7a31b020b2aba39066f4cc070b Mon Sep 17 00:00:00 2001
|
||||
From e8d1d035a459c7fb290661c78c1069160fe349a5 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
|
||||
@ -428,10 +428,10 @@ index c79e06387c94..6d1fa95d8b3a 100644
|
||||
|
||||
return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From e4ae7323aa2c8cf91790b6e23ed44209f9ef8888 Mon Sep 17 00:00:00 2001
|
||||
From d218fc14db7017e94777a590089fb5ae783eee28 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
|
||||
@ -498,10 +498,10 @@ index 2ed7fdea8349..9b88cd986909 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From d5f4d6925e69a6e9f608615bef38f92c1ef71ac6 Mon Sep 17 00:00:00 2001
|
||||
From 1c7d1768b1d4b909d960992255767f82cd999dfe 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
|
||||
@ -751,10 +751,10 @@ index 9b88cd986909..c66938271860 100644
|
||||
return FALSE;
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 3348b25d12ea2fc72843ba7326b6fa266031b69e Mon Sep 17 00:00:00 2001
|
||||
From d9cb6154bad1c59a0648a9a393b9f78ed688b956 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
|
||||
@ -1071,10 +1071,10 @@ index 20cfbceb36b0..a987025e0524 100644
|
||||
|
||||
G_END_DECLS
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From a4595840170ac9457717989da7b07dee653740e0 Mon Sep 17 00:00:00 2001
|
||||
From d1ace4e9f16825ea8a1c61fdd80358505b14f4e8 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
|
||||
@ -1346,10 +1346,10 @@ index 64f8295bf2b0..426993a4e154 100644
|
||||
</object>
|
||||
<packing>
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 0c4d86519524ddf002999c6f3b214c2b41bb3678 Mon Sep 17 00:00:00 2001
|
||||
From fe21666963d6f6111957e276b61b5cce3e4e08bf 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"
|
||||
@ -1639,10 +1639,10 @@ index 426993a4e154..7f4a94c88b6b 100644
|
||||
</object>
|
||||
<packing>
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 47807c171a1df778f0d7a3a9e23ff174c3e80f2e Mon Sep 17 00:00:00 2001
|
||||
From 93041c844654d5ddb91fdcf8748cd53c2895245e 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
|
||||
@ -1818,10 +1818,10 @@ index df59b1a58273..9a9a562a9d84 100644
|
||||
char *terminal_screen_get_current_dir (TerminalScreen *screen);
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 60da29daf408667dcbbdf51f4830c0eed8c1495b Mon Sep 17 00:00:00 2001
|
||||
From 3f6f13cfa2ae49f0d6ce17f501a7cee855dfd0a7 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
|
||||
@ -1997,10 +1997,10 @@ index 7f237b3b46b7..a3386dac16b5 100644
|
||||
(!prop_name ||
|
||||
prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 842429b887b6b14b878e7e4a2fd00475962c5714 Mon Sep 17 00:00:00 2001
|
||||
From 82a9258669ca0187a6234eb447176429b515a578 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
|
||||
@ -3741,10 +3741,10 @@ index 5aa43b113ed9..f892290c256f 100644
|
||||
#: ../src/profile-preferences.glade.h:74
|
||||
msgid "_Update login records when command is launched"
|
||||
diff --git a/po/oc.po b/po/oc.po
|
||||
index 9a6f6186019a..6e51ea2f8980 100644
|
||||
index 917b44306f7f..a8a8a1fb9c42 100644
|
||||
--- a/po/oc.po
|
||||
+++ b/po/oc.po
|
||||
@@ -2944,8 +2944,8 @@ msgstr "Tampar _la fenèstra"
|
||||
@@ -3007,8 +3007,8 @@ msgstr "Tampar _la fenèstra"
|
||||
#~ msgid "Save as..."
|
||||
#~ msgstr "Enregistrar jos..."
|
||||
|
||||
@ -3755,7 +3755,7 @@ index 9a6f6186019a..6e51ea2f8980 100644
|
||||
|
||||
#~ msgid "_Detach tab"
|
||||
#~ msgstr "Des_tacar l'onglet"
|
||||
@@ -3405,8 +3405,8 @@ msgstr "Tampar _la fenèstra"
|
||||
@@ -3468,8 +3468,8 @@ msgstr "Tampar _la fenèstra"
|
||||
#~ msgid "_Use the system fixed width font"
|
||||
#~ msgstr "_Utilizar la poliça de chassa fixa del sistèma"
|
||||
|
||||
@ -3766,7 +3766,7 @@ index 9a6f6186019a..6e51ea2f8980 100644
|
||||
|
||||
#~ msgid "The shortcut key “%s” is already bound to the “%s” action"
|
||||
#~ msgstr "L'acorchi de clavièr « %s » es ja atribuit a l'accion « %s »"
|
||||
@@ -3723,8 +3723,8 @@ msgstr "Tampar _la fenèstra"
|
||||
@@ -3786,8 +3786,8 @@ msgstr "Tampar _la fenèstra"
|
||||
#~ msgid "Run;"
|
||||
#~ msgstr "Executar;Consòla;Shell;"
|
||||
|
||||
@ -4740,10 +4740,10 @@ index 80cb23434a60..20e2a93ce3f0 100644
|
||||
+msgid "Transparent background"
|
||||
+msgstr "透明背景"
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 3c1f5551e5db30e1194b8d50e224c2d7aef9b54a Mon Sep 17 00:00:00 2001
|
||||
From e4c7b799a5e72ddbd2acaefa26f9a4af80fac940 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
|
||||
@ -4888,10 +4888,10 @@ index 6d1fa95d8b3a..69596045d43e 100644
|
||||
{ "tab-detach", action_tab_detach_cb, NULL, NULL, NULL },
|
||||
{ "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL },
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From fec24458f5a978034b95c063e59a3a3e5a2376af Mon Sep 17 00:00:00 2001
|
||||
From fe6a3e07d6d02a94554bb72c0633cabe539a2fc8 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
|
||||
@ -4918,10 +4918,10 @@ index a3386dac16b5..19c265839dc7 100644
|
||||
const char *p;
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 781dec0d0beeda7a313bfd46d0e2ac7704011049 Mon Sep 17 00:00:00 2001
|
||||
From 54f63ccf0da0bcf023bbb0418f7c0050933769de 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
|
||||
@ -5535,10 +5535,10 @@ index 69596045d43e..b8ab17eac3c5 100644
|
||||
|
||||
static void
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 67eddc128168422b34cc30ca77d2b10755110ffd Mon Sep 17 00:00:00 2001
|
||||
From 91ede222e7da4a48efdf17aa280f5c03a5006239 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
|
||||
@ -5710,10 +5710,10 @@ index c715e592a19a..8566312b879e 100644
|
||||
retval = G_SOURCE_REMOVE;
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 209c613cbd506c517a089f946fa4122212ba2f94 Mon Sep 17 00:00:00 2001
|
||||
From 54bc94c36e2d8f5eace4072b0d79ed76f5aa2d70 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
|
||||
@ -5723,13 +5723,13 @@ advertises the name of the current toolbox container.
|
||||
|
||||
https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
|
||||
---
|
||||
src/terminal-screen.c | 30 +++++++++++++++++++++++++++++-
|
||||
src/terminal-screen.c | 33 ++++++++++++++++++++++++++++++++-
|
||||
src/terminal-screen.h | 6 ++++++
|
||||
src/terminal-window.c | 26 ++++++++++++++++++++++++--
|
||||
3 files changed, 59 insertions(+), 3 deletions(-)
|
||||
3 files changed, 62 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index 8566312b879e..01350db0fb28 100644
|
||||
index 8566312b879e..c37dbdcd02be 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -879,6 +879,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
|
||||
@ -5758,12 +5758,15 @@ index 8566312b879e..01350db0fb28 100644
|
||||
{
|
||||
g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
|
||||
|
||||
@@ -890,8 +909,17 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
|
||||
@@ -890,8 +909,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
|
||||
terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data, FALSE);
|
||||
gs_free char* cwd = terminal_screen_get_current_dir (parent_screen);
|
||||
|
||||
+ if (override_command != NULL)
|
||||
+ {
|
||||
+ g_return_val_if_fail (parent_screen->priv->exec_data != NULL, FALSE);
|
||||
+ g_return_val_if_fail (data != NULL, FALSE);
|
||||
+
|
||||
+ g_strfreev (data->argv);
|
||||
+ data->argv = g_strdupv (override_command);
|
||||
+
|
||||
@ -5832,5 +5835,5 @@ index b8ab17eac3c5..ba23e7c99d3d 100644
|
||||
if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW)
|
||||
gtk_window_present (GTK_WINDOW (window));
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
Name: gnome-terminal
|
||||
Version: 3.40.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Terminal emulator for GNOME
|
||||
|
||||
License: GPLv3+ and GFDL and LGPLv2+
|
||||
@ -114,6 +114,10 @@ make check
|
||||
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
|
||||
|
||||
%changelog
|
||||
* Mon May 31 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.1-2
|
||||
- Bump required vte291 version
|
||||
- Update the downstream patches to include a soft assertion
|
||||
|
||||
* Tue May 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.1-1
|
||||
- Update to 3.40.1
|
||||
- Rebase the translations
|
||||
|
||||
Loading…
Reference in New Issue
Block a user