Update to 3.38.3

- Rebase the translations - Backport yet-to-be-released patches from upstream to avoid translation conflicts
2021-05-07 23:08:03 +02:00 · 2021-05-07 23:08:03 +02:00 · a893ed0579
commit a893ed0579
parent 9bd5071a07
5 changed files with 3183 additions and 4126 deletions
--- a/.gitignore
+++ b/.gitignore
@ -103,3 +103,4 @@ gnome-terminal-2.31.3.tar.bz2
 /gnome-terminal-3.37.90.tar.xz
 /gnome-terminal-3.38.0.tar.xz
 /gnome-terminal-3.38.1.tar.xz
+/gnome-terminal-3.38.3.tar.xz
--- a/gnome-terminal-backports-from-upstream.patch
+++ b/gnome-terminal-backports-from-upstream.patch
--- a/gnome-terminal-cntr-ntfy-autottl-ts.patch
+++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch
@ -1,4 +1,4 @@
-From 6715609da71987d6db7a70b4640f3b830dc405f8 Mon Sep 17 00:00:00 2001
+From 079a84cabc6a16cc8e2a52f659b3933da7d601be 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
@ -206,10 +206,10 @@ index 0c4ee5035215..128b74befc1e 100644
 
 static void
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 7a8953c50388..a3d77bf6719d 100644
+index 8adb1347f4db..979cf9f67db4 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2094,6 +2094,8 @@ terminal_window_init (TerminalWindow *window)
+@@ -2097,6 +2097,8 @@ terminal_window_init (TerminalWindow *window)
   };
   TerminalWindowPrivate *priv;
   TerminalApp *app;
@ -218,7 +218,7 @@ index 7a8953c50388..a3d77bf6719d 100644
   GSettings *gtk_debug_settings;
   GtkWindowGroup *window_group;
   //  GtkAccelGroup *accel_group;
-@@ -2109,6 +2111,11 @@ terminal_window_init (TerminalWindow *window)
+@@ -2112,6 +2114,11 @@ terminal_window_init (TerminalWindow *window)
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
@ -231,10 +231,10 @@ index 7a8953c50388..a3d77bf6719d 100644
   uuid_unparse (u, uuidstr);
   priv->uuid = g_strdup (uuidstr);
 -- 
-2.28.0
+2.30.2


-From c75db4814eaee946daccc526c5f37124f1981352 Mon Sep 17 00:00:00 2001
+From e32cc2d3067e1efa693d091f8d1ffef8b880dcd7 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
@ -254,10 +254,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016
 1 file changed, 21 insertions(+)

 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index a3d77bf6719d..36d155a9e420 100644
+index 979cf9f67db4..ef527a66841a 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1953,6 +1953,26 @@ terminal_window_realize (GtkWidget *widget)
+@@ -1956,6 +1956,26 @@ terminal_window_realize (GtkWidget *widget)
   terminal_window_update_size (window);
 }
 
@ -284,7 +284,7 @@ index a3d77bf6719d..36d155a9e420 100644
 static gboolean
 terminal_window_state_event (GtkWidget            *widget,
                              GdkEventWindowState  *event)
-@@ -2270,6 +2290,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+@@ -2273,6 +2293,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
 
   widget_class->show = terminal_window_show;
   widget_class->realize = terminal_window_realize;
@ -293,10 +293,10 @@ index a3d77bf6719d..36d155a9e420 100644
   widget_class->screen_changed = terminal_window_screen_changed;
   widget_class->style_updated = terminal_window_style_updated;
 -- 
-2.28.0
+2.30.2


-From e7810e47cf096ce6901e572bb9f5256601aed62d Mon Sep 17 00:00:00 2001
+From fddbb5ed689784329d3f4ca155d48a36d7912b30 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
@ -396,10 +396,10 @@ index 128b74befc1e..a1c3161391da 100644
 terminal_screen_button_press (GtkWidget      *widget,
                               GdkEventButton *event)
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 36d155a9e420..c0219d872725 100644
+index ef527a66841a..c5806488b4fc 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1959,15 +1959,21 @@ terminal_window_draw (GtkWidget *widget,
+@@ -1962,15 +1962,21 @@ terminal_window_draw (GtkWidget *widget,
 {
   if (gtk_widget_get_app_paintable (widget))
     {
@ -428,10 +428,10 @@ index 36d155a9e420..c0219d872725 100644
 
   return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
 -- 
-2.28.0
+2.30.2


-From de1231cf68fbe55ab7b7b2c4660091bfb05ec493 Mon Sep 17 00:00:00 2001
+From 50f55777c4584e87900a20b84484b759daca038e 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 a1c3161391da..e2545c3f9288 100644
 #endif
 
 -- 
-2.28.0
+2.30.2


-From b4a8b69b27a26f95371a1780ad61e97529cb8f90 Mon Sep 17 00:00:00 2001
+From ffb19612258e36391a67ef401ddefb3151fa484c 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 e2545c3f9288..57ea1cce26d5 100644
     return FALSE;
 
 -- 
-2.28.0
+2.30.2


-From 3e7242e41500b5a7c85133dc15a0b290cd67d861 Mon Sep 17 00:00:00 2001
+From 6b0b66df34511c882581152a8a5a730e27cdc0ec 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
@ -775,7 +775,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
 4 files changed, 174 insertions(+), 1 deletion(-)

 diff --git a/src/terminal-app.c b/src/terminal-app.c
-index 6a4fe03f2756..4e70facf9a43 100644
+index ff91e1561f39..a86688d34c33 100644
 --- a/src/terminal-app.c
 +++ b/src/terminal-app.c
@@ -730,6 +730,31 @@ app_menu_quit_cb (GSimpleAction *action,
@ -1071,10 +1071,10 @@ index 20cfbceb36b0..a987025e0524 100644
 
 G_END_DECLS
 -- 
-2.28.0
+2.30.2


-From a6dbcf9b15ae96829c5a1c20e2901c722457b3c6 Mon Sep 17 00:00:00 2001
+From e6b48d950c789e71b3cd8e7a7011c4dd895f992a 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.28.0
+2.30.2


-From 528ffc16192fbd45fdb709a0c58dd5f51ab524e9 Mon Sep 17 00:00:00 2001
+From c18beb99fc34d215521b9063cbbe79e3f654b294 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.28.0
+2.30.2


-From c95d6adef9b1c1c447249a44eb56750b321000e0 Mon Sep 17 00:00:00 2001
+From a804b794790814ca7a09973c6ff4d9ef778157c0 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 8ea337867222..049bbe5a2b8b 100644
 char *terminal_screen_get_current_dir (TerminalScreen *screen);
 
 -- 
-2.28.0
+2.30.2


-From 9c755aefcb53d63da73214a911ab75dd4fe6b7e2 Mon Sep 17 00:00:00 2001
+From 96494c4c9c73e2f6238faace0f2f212152e1da46 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 91c76df3feea..7724af0dfa04 100644
       (!prop_name ||
        prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
 -- 
-2.28.0
+2.30.2


-From f0e0ecdab4c22e7e1f44b5da9a6618c6563c5f5b Mon Sep 17 00:00:00 2001
+From a64a0c4b13a0b6cc5a7d1d09a314bc480f8b8f51 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
@ -2381,21 +2381,21 @@ index 4906009cf46f..f97d43b0e515 100644
 #: ../src/profile-preferences.glade.h:77
 msgid "_Unlimited"
 diff --git a/po/bn_IN.po b/po/bn_IN.po
-index f196e5084797..0ac3caf77e73 100644
+index 96f28aae6b4f..fdd0ef726900 100644
 --- a/po/bn_IN.po
 +++ b/po/bn_IN.po
-@@ -2296,8 +2296,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
- #~ msgid "Close Window"
- #~ msgstr "উইন্ডো বন্ধ করুন"
+@@ -2894,8 +2894,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
+ #~ msgid "_Unlimited"
+ #~ msgstr "সীমাহীন (_U)"
 
 -#~ msgid "Set Title"
 -#~ msgstr "শিরোনাম নির্ধারণ করুন"
 +msgid "Set Title"
 +msgstr "শিরোনাম নির্ধারণ করুন"
 
- #~ msgid "Switch to Tab 2"
- #~ msgstr "ট্যাব ২-এ পরিবর্তন করুন"
-@@ -2356,5 +2356,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
+ #~ msgid "Switch to Tab 3"
+ #~ msgstr "ট্যাব ৩-এ পরিবর্তন করুন"
+@@ -2936,5 +2936,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
 #~ msgid "_Input Methods"
 #~ msgstr "ইনপুট পদ্ধতি (_I)"
 
@ -3613,11 +3613,11 @@ index 114f0d4e50c2..5d3f2e011f1c 100644
 #~ msgid "_Update login records when command is launched"
 #~ msgstr "_Kemaskini rekod logmasuk bila arahan dilancarkan"
 diff --git a/po/nb.po b/po/nb.po
-index 683acfe5221e..3dc97ee17fec 100644
+index e48f82bf732b..4a311f73d1ad 100644
 --- a/po/nb.po
 +++ b/po/nb.po
-@@ -2261,3 +2261,15 @@ msgstr ""
- #: ../src/terminal-window.c:3210
+@@ -2406,3 +2406,15 @@ msgstr ""
+ #: src/terminal-window.c:3224
 msgid "C_lose Window"
 msgstr "_Lukk vindu"
 +
@ -4460,7 +4460,7 @@ index 63263749655c..496da331bbf9 100644
 #~ msgid ""
 #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/tr.po b/po/tr.po
-index 3ac22937b896..bd971dd81d73 100644
+index 48d0a777c746..c7e928435343 100644
 --- a/po/tr.po
 +++ b/po/tr.po
@@ -2731,3 +2731,15 @@ msgstr "_Pencereyi Kapat"
@ -4741,10 +4741,10 @@ index 80cb23434a60..20e2a93ce3f0 100644
 +msgid "Transparent background"
 +msgstr "透明背景"
 -- 
-2.28.0
+2.30.2


-From fc5845548ab6cbf56888c81fafdf63659ef9c337 Mon Sep 17 00:00:00 2001
+From 349b623015a495b514f37bdaa637eef2a16a2157 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
@ -4796,7 +4796,7 @@ index 333c6d17006c..c0371c5cada4 100644
 
 static KeyEntry tabs_entries[] = {
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index c0219d872725..61c5e7de350a 100644
+index c5806488b4fc..756f2b9fea0c 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
@@ -749,6 +749,80 @@ action_select_all_cb (GSimpleAction *action,
@ -4880,7 +4880,7 @@ index c0219d872725..61c5e7de350a 100644
 static void
 action_reset_cb (GSimpleAction *action,
                  GVariant *parameter,
-@@ -2086,6 +2160,7 @@ terminal_window_init (TerminalWindow *window)
+@@ -2089,6 +2163,7 @@ terminal_window_init (TerminalWindow *window)
     { "paste-uris",          action_paste_uris_cb,       NULL,   NULL, NULL },
     { "reset",               action_reset_cb,            "b",    NULL, NULL },
     { "select-all",          action_select_all_cb,       NULL,   NULL, NULL },
@ -4889,10 +4889,10 @@ index c0219d872725..61c5e7de350a 100644
     { "tab-detach",          action_tab_detach_cb,       NULL,   NULL, NULL },
     { "tab-move-left",       action_tab_move_left_cb,    NULL,   NULL, NULL },
 -- 
-2.28.0
+2.30.2


-From e5d3a23ff1f72a2fb2887abcbcb9a4d33dd4cdc3 Mon Sep 17 00:00:00 2001
+From b4db667777494f7a2f2f0e3e8f3a785385ccfa8c 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
@ -4919,10 +4919,10 @@ index 7724af0dfa04..3e93ab8ff7e5 100644
     const char *p;
 
 -- 
-2.28.0
+2.30.2


-From 4dbaed23edd26456c0509d4bc5424acbdb9140f9 Mon Sep 17 00:00:00 2001
+From 7149138f4d41cf1437043c9e341261bfaf56ac8a 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
@ -5509,7 +5509,7 @@ index 049bbe5a2b8b..5b7fcc59ddd0 100644
 
 void       terminal_screen_get_size (TerminalScreen *screen,
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 61c5e7de350a..0d61db3c125d 100644
+index 756f2b9fea0c..716f919d933b 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
@@ -767,6 +767,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog,
@ -5525,7 +5525,7 @@ index 61c5e7de350a..0d61db3c125d 100644
 static void
 action_set_title_cb (GSimpleAction *action,
                      GVariant *parameter,
-@@ -2521,8 +2527,7 @@ sync_screen_title (TerminalScreen *screen,
+@@ -2524,8 +2530,7 @@ sync_screen_title (TerminalScreen *screen,
     return;
 
   title = terminal_screen_get_title (screen);
@ -5536,10 +5536,10 @@ index 61c5e7de350a..0d61db3c125d 100644
 
 static void
 -- 
-2.28.0
+2.30.2


-From 19071280279ea0a81ecda37e5b24fd1d372c34c0 Mon Sep 17 00:00:00 2001
+From 7affe256ce694af1e319843082e569ad4d6857d3 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
@ -5711,10 +5711,10 @@ index 95ad21f6e867..71c98503caf9 100644
   retval = G_SOURCE_REMOVE;
 
 -- 
-2.28.0
+2.30.2


-From 8cfe298ce5bc7123d58a14a1746d6b51ce7b26c2 Mon Sep 17 00:00:00 2001
+From 3de61348c1789d38e3f212c6ad4aee14f7d681d5 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
@ -5796,7 +5796,7 @@ index 5b7fcc59ddd0..5b1f983a7049 100644
                                   GSettings      *profile);
 GSettings* terminal_screen_get_profile (TerminalScreen *screen);
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 0d61db3c125d..ad3a95af7008 100644
+index 716f919d933b..5ab887ef78e5 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
@@ -405,8 +405,30 @@ action_new_terminal_cb (GSimpleAction *action,
@ -5833,5 +5833,5 @@ index 0d61db3c125d..ad3a95af7008 100644
   if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW)
     gtk_window_present (GTK_WINDOW (window));
 -- 
-2.28.0
+2.30.2

--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@ -7,8 +7,8 @@
 %define desktop_file_utils_version 0.2.90

 Name: gnome-terminal
-Version: 3.38.1
-Release: 3%{?dist}
+Version: 3.38.3
+Release: 1%{?dist}
 Summary: Terminal emulator for GNOME

 License: GPLv3+ and GFDL and LGPLv2+
@ -114,6 +114,12 @@ make check
 %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml

 %changelog
+* Fri May 07 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.38.3-1
+- Update to 3.38.3
+- Rebase the translations
+- Backport yet-to-be-released patches from upstream to avoid translation
+  conflicts
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gnome-terminal-3.38.1.tar.xz) = 99d1e87a56dd5ce0c421f8b1ab197f25d8e878cbf1166786263cc9bf85b28eba327b0228a4ec35b8f656bdc3c5d7d48c5aca1768148fc5f324ff3f1c70983993
+SHA512 (gnome-terminal-3.38.3.tar.xz) = 1dc418faaafce019be75173ad035f2536bfec7fea179ecf76f054a62651137339a018198cd6a0cfd63a7a15a1dcf803b62d19a48545a06a133fde186bfbf88ca