Update to 3.40.2

- Backport yet-to-be-released patches from upstream to avoid
  translation conflicts

.gitignore

@@ -107,3 +107,4 @@ gnome-terminal-2.31.3.tar.bz2
 /gnome-terminal-3.39.90.tar.xz
 /gnome-terminal-3.40.0.tar.xz
 /gnome-terminal-3.40.1.tar.xz
+/gnome-terminal-3.40.2.tar.xz

gnome-terminal-cntr-ntfy-autottl-ts.patch

@@ -1,4 +1,4 @@
-From 2c637b70285d9fd53e75e873b35fa3cac1964729 Mon Sep 17 00:00:00 2001
+From 49ed8af3bbeb7b72950b7308c72f83a9403dd883 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
@@ -138,10 +138,10 @@ index 4098f90bf10e..35bd24791417 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 08b6e85fccac..f79697dd6018 100644
+index b146ba82eae3..d2917fac37f2 100644
 --- a/src/terminal-schemas.h
 +++ b/src/terminal-schemas.h
-@@ -76,6 +76,9 @@ G_BEGIN_DECLS
+@@ -78,6 +78,9 @@ G_BEGIN_DECLS
  #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
  #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
  
@@ -234,7 +234,7 @@ index 537cd2e1d8b1..d87bbb6f24ec 100644
 2.31.1
 
 
-From b956e0801252cc8c62cbe05237fe36ae3ef7b5d9 Mon Sep 17 00:00:00 2001
+From 10b806c480110bb8dae3bdae87f4c7f366e632cc 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 d87bbb6f24ec..c79e06387c94 100644
 2.31.1
 
 
-From e8d1d035a459c7fb290661c78c1069160fe349a5 Mon Sep 17 00:00:00 2001
+From 31af2e59bb75553c24ee53deeccb22aab1438ade 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
@@ -431,7 +431,7 @@ index c79e06387c94..6d1fa95d8b3a 100644
 2.31.1
 
 
-From d218fc14db7017e94777a590089fb5ae783eee28 Mon Sep 17 00:00:00 2001
+From efb58ed854892d81da00363a32a84c37fc9702d9 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
@@ -501,7 +501,7 @@ index 2ed7fdea8349..9b88cd986909 100644
 2.31.1
 
 
-From 1c7d1768b1d4b909d960992255767f82cd999dfe Mon Sep 17 00:00:00 2001
+From 31c500155edbc893e79df97fbd5b291af2ed4f91 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
@@ -754,7 +754,7 @@ index 9b88cd986909..c66938271860 100644
 2.31.1
 
 
-From d9cb6154bad1c59a0648a9a393b9f78ed688b956 Mon Sep 17 00:00:00 2001
+From 800ac8908d3675b2e885edf2e972c0fa42d7ea51 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,10 +775,10 @@ 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 ff91e1561f39..a86688d34c33 100644
+index cf790fb44fc8..499011a8165a 100644
 --- a/src/terminal-app.c
 +++ b/src/terminal-app.c
-@@ -730,6 +730,31 @@ app_menu_quit_cb (GSimpleAction *action,
+@@ -739,6 +739,31 @@ app_menu_quit_cb (GSimpleAction *action,
      gtk_widget_destroy (GTK_WIDGET (window));
  }
  
@@ -810,7 +810,7 @@ index ff91e1561f39..a86688d34c33 100644
  /* Class implementation */
  
  G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION)
-@@ -753,6 +778,10 @@ terminal_app_startup (GApplication *application)
+@@ -762,6 +787,10 @@ terminal_app_startup (GApplication *application)
      { "quit",        app_menu_quit_cb,          NULL, NULL, NULL }
    };
  
@@ -821,7 +821,7 @@ index ff91e1561f39..a86688d34c33 100644
    g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX);
  
    G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application);
-@@ -763,6 +792,9 @@ terminal_app_startup (GApplication *application)
+@@ -772,6 +801,9 @@ terminal_app_startup (GApplication *application)
    g_action_map_add_action_entries (G_ACTION_MAP (application),
                                     action_entries, G_N_ELEMENTS (action_entries),
                                     application);
@@ -1074,7 +1074,7 @@ index 20cfbceb36b0..a987025e0524 100644
 2.31.1
 
 
-From d1ace4e9f16825ea8a1c61fdd80358505b14f4e8 Mon Sep 17 00:00:00 2001
+From 91d3a2c296febe824b4143f878965a0f9397238f 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
@@ -1349,7 +1349,7 @@ index 64f8295bf2b0..426993a4e154 100644
 2.31.1
 
 
-From fe21666963d6f6111957e276b61b5cce3e4e08bf Mon Sep 17 00:00:00 2001
+From 81dc06bd563af0b3391a71e70b4604a11461caa5 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"
@@ -1642,7 +1642,7 @@ index 426993a4e154..7f4a94c88b6b 100644
 2.31.1
 
 
-From 93041c844654d5ddb91fdcf8748cd53c2895245e Mon Sep 17 00:00:00 2001
+From ee98a681f6a6281672ba02e90efb472ff6d273a4 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
@@ -1821,7 +1821,7 @@ index df59b1a58273..9a9a562a9d84 100644
 2.31.1
 
 
-From 3f6f13cfa2ae49f0d6ce17f501a7cee855dfd0a7 Mon Sep 17 00:00:00 2001
+From 3596c195e594caff9370392a181e001ab1106be2 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
@@ -1953,10 +1953,10 @@ index 35bd24791417..df1f219608c4 100644
                                 gtk_builder_get_object (builder,
                                                         "use-custom-command-checkbutton"),
 diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
-index f79697dd6018..e37fad2992ea 100644
+index d2917fac37f2..16e5c3264725 100644
 --- a/src/terminal-schemas.h
 +++ b/src/terminal-schemas.h
-@@ -69,6 +69,7 @@ G_BEGIN_DECLS
+@@ -71,6 +71,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"
@@ -2000,7 +2000,7 @@ index 7f237b3b46b7..a3386dac16b5 100644
 2.31.1
 
 
-From 82a9258669ca0187a6234eb447176429b515a578 Mon Sep 17 00:00:00 2001
+From ffd0ffa95467e538413f0410597174e3c0233692 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 917b44306f7f..a8a8a1fb9c42 100644
+index 169828e2828f..b4bdec693f2f 100644
 --- a/po/oc.po
 +++ b/po/oc.po
-@@ -3007,8 +3007,8 @@ msgstr "Tampar _la fenèstra"
+@@ -3010,8 +3010,8 @@ msgstr "Tampar _la fenèstra"
  #~ msgid "Save as..."
  #~ msgstr "Enregistrar jos..."
  
@@ -3755,7 +3755,7 @@ index 917b44306f7f..a8a8a1fb9c42 100644
  
  #~ msgid "_Detach tab"
  #~ msgstr "Des_tacar l'onglet"
-@@ -3468,8 +3468,8 @@ msgstr "Tampar _la fenèstra"
+@@ -3471,8 +3471,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 917b44306f7f..a8a8a1fb9c42 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 »"
-@@ -3786,8 +3786,8 @@ msgstr "Tampar _la fenèstra"
+@@ -3789,8 +3789,8 @@ msgstr "Tampar _la fenèstra"
  #~ msgid "Run;"
  #~ msgstr "Executar;Consòla;Shell;"
  
@@ -4038,10 +4038,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 765dcf2a034d..96bff962d86e 100644
+index e6745075ee55..20d303c8a302 100644
 --- a/po/sk.po
 +++ b/po/sk.po
-@@ -3076,3 +3076,15 @@ msgstr "_Zavrieť okno"
+@@ -3086,3 +3086,15 @@ msgstr "_Zavrieť okno"
  #~ "\n"
  #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
  #~ "help“.\n"
@@ -4743,7 +4743,7 @@ index 80cb23434a60..20e2a93ce3f0 100644
 2.31.1
 
 
-From e4c7b799a5e72ddbd2acaefa26f9a4af80fac940 Mon Sep 17 00:00:00 2001
+From 5d71d4d1728cc106230b28f208d95450c49db59a 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
@@ -4891,7 +4891,7 @@ index 6d1fa95d8b3a..69596045d43e 100644
 2.31.1
 
 
-From fe6a3e07d6d02a94554bb72c0633cabe539a2fc8 Mon Sep 17 00:00:00 2001
+From 8df8cab8326904951559876d7600ce8135ca8d88 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
@@ -4921,7 +4921,7 @@ index a3386dac16b5..19c265839dc7 100644
 2.31.1
 
 
-From 54f63ccf0da0bcf023bbb0418f7c0050933769de Mon Sep 17 00:00:00 2001
+From 023fe19f34ddd3b5efab064015d707dd005e34dc 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
@@ -5063,10 +5063,10 @@ index 93f1460c2207..5e816f71c10e 100644
  {
    TERMINAL_EXIT_CLOSE,
 diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
-index e37fad2992ea..c416eb5a2090 100644
+index 16e5c3264725..bb3048fafe48 100644
 --- a/src/terminal-schemas.h
 +++ b/src/terminal-schemas.h
-@@ -69,6 +69,7 @@ G_BEGIN_DECLS
+@@ -71,6 +71,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"
@@ -5538,7 +5538,7 @@ index 69596045d43e..b8ab17eac3c5 100644
 2.31.1
 
 
-From 91ede222e7da4a48efdf17aa280f5c03a5006239 Mon Sep 17 00:00:00 2001
+From 749289f4bf0359dd67519d82cf66a33fff4548e3 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
@@ -5571,10 +5571,10 @@ index d67da299d14a..0939471736a3 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 c416eb5a2090..70acf3c9e6b9 100644
+index bb3048fafe48..d5ee2a88b22f 100644
 --- a/src/terminal-schemas.h
 +++ b/src/terminal-schemas.h
-@@ -68,6 +68,7 @@ G_BEGIN_DECLS
+@@ -70,6 +70,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"
@@ -5713,7 +5713,7 @@ index c715e592a19a..8566312b879e 100644
 2.31.1
 
 
-From 54bc94c36e2d8f5eace4072b0d79ed76f5aa2d70 Mon Sep 17 00:00:00 2001
+From 823ee952840f976a3bda0a26cb4095c81e5c2dcb 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

gnome-terminal.spec

@@ -7,8 +7,8 @@
 %define desktop_file_utils_version 0.2.90
 
 Name: gnome-terminal
-Version: 3.40.1
-Release: 2%{?dist}
+Version: 3.40.2
+Release: 1%{?dist}
 Summary: Terminal emulator for GNOME
 
 License: GPLv3+ and GFDL and LGPLv2+
@@ -107,6 +107,10 @@ make check
 %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg
 %{_datadir}/man/man1/gnome-terminal.1*
+
+%dir %{_libdir}/gnome-terminal
+%{_libdir}/gnome-terminal/gschemas.compiled
+
 %{_userunitdir}/gnome-terminal-server.service
 
 %files nautilus
@@ -114,6 +118,11 @@ make check
 %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
 
 %changelog
+* Wed Jun 16 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.2-1
+- Update to 3.40.2
+- Backport yet-to-be-released patches from upstream to avoid translation
+  conflicts
+
 * 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

sources

@@ -1 +1 @@
-SHA512 (gnome-terminal-3.40.1.tar.xz) = 8e16b3c8513cf3c503a4a35e2c238ea41b087d426787402e0db5ef7e4bc5303d5a34a6455f651760327560f73edf3256177bbe3633e8a5b8abe8edab2bda7698
+SHA512 (gnome-terminal-3.40.2.tar.xz) = d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100