diff --git a/.gitignore b/.gitignore index 7ae114d..8c4a4d5 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.40.3.tar.xz /gnome-terminal-3.41.0.tar.xz /gnome-terminal-3.42.0.tar.bz2 +/gnome-terminal-3.42.1.tar.bz2 diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index 04fa0c4..c744cbc 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,249 +1,7 @@ -From bda3c4bd394cb70b336ef6359e6760bb006c825b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= -Date: Fri, 24 Sep 2021 15:06:52 +0200 -Subject: [PATCH 01/17] Updated Czech translation - ---- - po/cs.po | 120 +++++++++++-------------------------------------------- - 1 file changed, 23 insertions(+), 97 deletions(-) - -diff --git a/po/cs.po b/po/cs.po -index 1beaf216..5a4d02a4 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -14,10 +14,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: gnome-terminal\n" -+"Project-Id-Version: gnome-terminal gnome-41\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n" --"POT-Creation-Date: 2021-07-31 12:57+0000\n" --"PO-Revision-Date: 2021-02-07 19:52+0100\n" -+"POT-Creation-Date: 2021-09-22 16:39+0000\n" -+"PO-Revision-Date: 2021-09-24 15:05+0200\n" - "Last-Translator: Marek Černocký \n" - "Language-Team: čeština \n" - "Language: cs\n" -@@ -28,32 +28,14 @@ msgstr "" - "X-Generator: Gtranslator 2.91.7\n" - - #: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:35 --msgid "org.gnome.Terminal.Nautilus" --msgstr "" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36 --msgid "org.gnome.Nautilus.desktop" --msgstr "" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:37 --#: data/org.gnome.Terminal.metainfo.xml.in:36 --msgid "GPL-3.0+ or GFDL-1.3-only" --msgstr "GPL-3.0+ nebo GFDL-1.3 výhradně" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38 --#: data/org.gnome.Terminal.metainfo.xml.in:37 --msgid "GPL-3.0+" --msgstr "GPL-3.0+" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:39 - msgid "Terminal plugin for Files" - msgstr "Zásuvný modul Terminál pro Soubory" - --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:40 -+#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36 - msgid "Open a terminal from Files" - msgstr "Otevírá terminál z aplikace Soubory" - --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:42 -+#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38 - msgid "" - "Open Terminal is a plugin for the Files application that adds a menu item to " - "the context menu to open a terminal in the currently browsed directory." -@@ -61,28 +43,8 @@ msgstr "" - "Otevřít terminál je zásuvný modul pro aplikaci Soubory, který přidává do " - "kontextové nabídky položku pro otevření terminálu v právě procházené složce." - --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:44 --#: data/org.gnome.Terminal.metainfo.xml.in:59 --msgid "https://wiki.gnome.org/Apps/Terminal" --msgstr "https://wiki.gnome.org/Apps/Terminal" -- --#. This is the name of a colour scheme --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:45 --#: data/org.gnome.Terminal.metainfo.xml.in:60 src/preferences.ui:214 --msgid "GNOME" --msgstr "GNOME" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:46 --#: data/org.gnome.Terminal.metainfo.xml.in:61 --msgid "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" --msgstr "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" -- --#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:47 --msgid "gnome-terminal" --msgstr "" -- - #: data/org.gnome.Terminal.desktop.in:3 --#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150 -+#: data/org.gnome.Terminal.metainfo.xml.in:34 src/server.cc:150 - #: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144 - #: src/terminal-tab-label.cc:81 src/terminal-window.cc:1894 - #: src/terminal-window.cc:2160 src/terminal-window.cc:2443 src/terminal.cc:570 -@@ -90,7 +52,7 @@ msgid "Terminal" - msgstr "Terminál" - - #: data/org.gnome.Terminal.desktop.in:4 --#: data/org.gnome.Terminal.metainfo.xml.in:39 -+#: data/org.gnome.Terminal.metainfo.xml.in:35 - msgid "Use the command line" - msgstr "Používejte příkazový řádek" - -@@ -100,7 +62,7 @@ msgstr "shell;prompt;výzva;příkaz;příkazový řádek;příkazová řádka;" - - #: data/org.gnome.Terminal.desktop.in:8 - msgid "org.gnome.Terminal" --msgstr "" -+msgstr "org.gnome.Terminal" - - #: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127 - msgid "New Window" -@@ -110,11 +72,7 @@ msgstr "Nové okno" - msgid "Preferences" - msgstr "Předvolby" - --#: data/org.gnome.Terminal.metainfo.xml.in:35 --msgid "org.gnome.Terminal.desktop" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:41 -+#: data/org.gnome.Terminal.metainfo.xml.in:37 - msgid "" - "GNOME Terminal is a terminal emulator application for accessing a UNIX shell " - "environment which can be used to run programs available on your system." -@@ -123,51 +81,13 @@ msgstr "" - "UNIXového shellu a v něm umožňuje spouštět programy dostupné ve vašem " - "systému." - --#: data/org.gnome.Terminal.metainfo.xml.in:42 -+#: data/org.gnome.Terminal.metainfo.xml.in:38 - msgid "" - "It supports several profiles, multiple tabs and implements several keyboard " - "shortcuts." - msgstr "" - "Podporuje více profilů, více terminálů v kartách a řadu klávesových zkratek." - --#: data/org.gnome.Terminal.metainfo.xml.in:45 --msgid "console" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:46 --msgid "keyboard" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:47 --msgid "pointing" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:50 --msgid "" --"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png" --msgstr "" --"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png" -- --#: data/org.gnome.Terminal.metainfo.xml.in:53 --msgid "HiDpiIcon" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:54 --msgid "HighContrast" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:55 --msgid "ModernToolkit" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:56 --msgid "SearchProvider" --msgstr "" -- --#: data/org.gnome.Terminal.metainfo.xml.in:57 --msgid "UserDocs" --msgstr "" -- - #. Translators: Keep single quote please! - #: src/org.gnome.Terminal.gschema.xml:133 - msgctxt "visible-name" -@@ -959,6 +879,11 @@ msgstr "spustit příkaz znovu" - msgid "Hold the terminal open" - msgstr "nechat terminál otevřený" - -+#. This is the name of a colour scheme -+#: src/preferences.ui:214 -+msgid "GNOME" -+msgstr "GNOME" -+ - #. This is the name of a colour scheme - #: src/preferences.ui:217 - msgid "Tango" -@@ -1760,7 +1685,7 @@ msgstr "_4. 132 × 42" - msgid "_Inspector" - msgstr "_Inspektor" - --#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1540 -+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1543 - #: src/terminal-window.cc:1788 - msgid "_Preferences" - msgstr "_Předvolby" -@@ -2257,29 +2182,29 @@ msgstr "Klávesové zkratky" - msgid "Profiles" - msgstr "Profily" - --#: src/terminal-screen.cc:1425 -+#: src/terminal-screen.cc:1428 - msgid "No command supplied nor shell requested" - msgstr "Není ani zadán příkaz ani požadován shell" - --#: src/terminal-screen.cc:1541 src/terminal-screen.cc:1888 -+#: src/terminal-screen.cc:1544 src/terminal-screen.cc:1891 - msgid "_Relaunch" - msgstr "_Spustit znovu" - --#: src/terminal-screen.cc:1544 -+#: src/terminal-screen.cc:1547 - msgid "There was an error creating the child process for this terminal" - msgstr "Při vytváření procesu potomka pro tento terminál došlo k chybě" - --#: src/terminal-screen.cc:1892 -+#: src/terminal-screen.cc:1895 - #, c-format - msgid "The child process exited normally with status %d." - msgstr "Proces potomka skončil normálně se stavovým kódem %d." - --#: src/terminal-screen.cc:1895 -+#: src/terminal-screen.cc:1898 - #, c-format - msgid "The child process was aborted by signal %d." - msgstr "Proces potomka byl zrušen na základě signálu %d." - --#: src/terminal-screen.cc:1898 -+#: src/terminal-screen.cc:1901 - msgid "The child process was aborted." - msgstr "Proces potomka byl zrušen." - -@@ -2452,3 +2377,4 @@ msgstr "_Zavřít okno" - #, c-format - msgid "Failed to parse arguments: %s\n" - msgstr "Selhala analýza argumentů: %s\n" -+ --- -2.32.0 - - -From 04e0dca711e3c76cf1a47862b4c3979fa932521b Mon Sep 17 00:00:00 2001 +From 81cc88e1f0ce5db52def90d54f035d2b45f8fa91 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH 02/17] Restore transparency +Subject: [PATCH 01/16] Restore transparency The transparency settings were removed as a side effect of 2bff4b63ed3ceef6055e35563e9b0b33ad57349d @@ -476,13 +234,13 @@ index 02a96d81..0b68a8e9 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.32.0 +2.33.1 -From b90dada28760377e8cd7aaa1ab48b3645d761aee Mon Sep 17 00:00:00 2001 +From 0e08a901e4b397a92133e219e6635410dcb5460d Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 -Subject: [PATCH 03/17] window: Make the drawing robust across all themes +Subject: [PATCH 02/16] window: Make the drawing robust across all themes There are lots of themes out there in the wild that do not specify a background-color for all widgets and the default is transparent. This @@ -538,13 +296,13 @@ index 0b68a8e9..5019a3ac 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.32.0 +2.33.1 -From 42f75b51144a6a93e442334b4793f4f885a32d4c Mon Sep 17 00:00:00 2001 +From ecd90177c78a8a41593d4042c655736d338874de Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 -Subject: [PATCH 04/17] screen, window: Extra padding around transparent +Subject: [PATCH 03/16] screen, window: Extra padding around transparent terminals in Wayland https://bugzilla.redhat.com/show_bug.cgi?id=1207943 @@ -673,13 +431,13 @@ index 5019a3ac..5513eedc 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.32.0 +2.33.1 -From b9757a4f2a1d9c6e43d67ac5e6889da1e833852f Mon Sep 17 00:00:00 2001 +From 194fef84186f5707802cd649cb16858025de7175 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 18 May 2018 20:15:34 +0200 -Subject: [PATCH 05/17] screen: Try harder to find a foreground process group +Subject: [PATCH 04/16] screen: Try harder to find a foreground process group member For pipelined commands, it's possible that the process group leader, @@ -743,13 +501,13 @@ index c1cf61f1..e6b382f0 100644 #endif -- -2.32.0 +2.33.1 -From f0d2856d40d39092bed50f7a413e6ed69cabbcbb Mon Sep 17 00:00:00 2001 +From 115531d2349ad676f133ff46d79339cde6fcc1b6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 3 May 2018 16:49:28 +0200 -Subject: [PATCH 06/17] screen: Track the current foreground process +Subject: [PATCH 05/16] screen: Track the current foreground process ... using the interactive shell's precmd and preexec hooks, by monitoring the contents of the terminal, and a combination of @@ -998,13 +756,13 @@ index e6b382f0..8e3d2a85 100644 return FALSE; -- -2.32.0 +2.33.1 -From 7d68c5aed8c198100e1b98ac4feb960e96221875 Mon Sep 17 00:00:00 2001 +From fee359d0314ed0bc8fd8c723dda9afe3d3f1d5ba Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 10 May 2018 19:23:16 +0200 -Subject: [PATCH 07/17] Notify when a long-running foreground process group +Subject: [PATCH 06/16] Notify when a long-running foreground process group terminates Notifications are only sent if the VteTerminal in which the process @@ -1318,13 +1076,13 @@ index 91b7e617..37e808a7 100644 G_END_DECLS -- -2.32.0 +2.33.1 -From 715742991a70a772efecb784ec1fa0fa8bbd2347 Mon Sep 17 00:00:00 2001 +From 0c4b472f2b3ed9da9325a1674b823ef001e3be13 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 -Subject: [PATCH 08/17] profile: Split the Command tab into two nested GtkGrids +Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids This will let the subsequent patch add a "Command" sub-heading to keep the command settings separate from the to-be-restored title settings. @@ -1593,13 +1351,13 @@ index 64f8295b..426993a4 100644 -- -2.32.0 +2.33.1 -From 28759a83bbbdf3143f8925ca63078e1c5e63fa4f Mon Sep 17 00:00:00 2001 +From ae82844709a77dcc21f9d1a354456835195f5895 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 -Subject: [PATCH 09/17] Revert "profile: Remove the "Command" sub-heading" +Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading" This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c. @@ -1886,13 +1644,13 @@ index 426993a4..7f4a94c8 100644 -- -2.32.0 +2.33.1 -From 149c9ebc4f5675969ffce6ee04b81553a3b60f34 Mon Sep 17 00:00:00 2001 +From d806f9a3d4529f67ee0340515e90545de3364e95 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 -Subject: [PATCH 10/17] Revert "screen: Remove unused description and +Subject: [PATCH 09/16] Revert "screen: Remove unused description and user_title API" This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. @@ -2066,13 +1824,13 @@ index df59b1a5..9a9a562a 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.32.0 +2.33.1 -From 9dd8a0a60572fe92adca8e1fd4348e1882f5a1c1 Mon Sep 17 00:00:00 2001 +From 167ab114825a7cad4cc7708345ec1d95714c7d64 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 -Subject: [PATCH 11/17] Revert "Remove the static title setting from profile +Subject: [PATCH 10/16] Revert "Remove the static title setting from profile preferences" This reverts commit e9cb8fea14a849704074c5d69f173bcf4dc2fb27. @@ -2246,13 +2004,13 @@ index bcdb19ce..f8650501 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.32.0 +2.33.1 -From 22c8810a732244a588dc733cdeaf3fabf477a5cb Mon Sep 17 00:00:00 2001 +From d0534fad64788e6f70389b8fa815d277a00ae51a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 -Subject: [PATCH 12/17] Restore translations for setting a title and +Subject: [PATCH 11/16] Restore translations for setting a title and transparency --- @@ -4985,13 +4743,13 @@ index 80cb2343..20e2a93c 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.32.0 +2.33.1 -From 932cda700ffa51e88eb15e4fade85907567eb5df Mon Sep 17 00:00:00 2001 +From 53538af455444a678bb42240b50db1b619358fef Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 -Subject: [PATCH 13/17] Restore the action and shortcut to set a static title +Subject: [PATCH 12/16] Restore the action and shortcut to set a static title from the menus This reverts 9bbe19e98f62aa3c9020913a3a5a8080a5177505 with various @@ -5134,13 +4892,13 @@ index 5513eedc..0fcc8e31 100644 { "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr }, { "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr }, -- -2.32.0 +2.33.1 -From 00d98f36e6ea7d50438db1a97e122e0363f1cff0 Mon Sep 17 00:00:00 2001 +From 4ee0e83c2c45635c7afc402c91450dcebb53ce1b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 -Subject: [PATCH 14/17] screen: Style fix +Subject: [PATCH 13/16] screen: Style fix This brings the code in line with how it was before de0dc7c2649c42e2aa02a66e4be27d262b34452d @@ -5164,13 +4922,13 @@ index f8650501..4a48cd2e 100644 const char *p; -- -2.32.0 +2.33.1 -From a2bd48e8eb44106357638651eef9f682deef8780 Mon Sep 17 00:00:00 2001 +From 0b2bfd1a64746f552e0e166228febee302fd608e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 -Subject: [PATCH 15/17] Restore the rest of the title handling options and make +Subject: [PATCH 14/16] Restore the rest of the title handling options and make it all work This reverts commit f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8 and makes @@ -5783,13 +5541,13 @@ index 0fcc8e31..3e730bc8 100644 static void -- -2.32.0 +2.33.1 -From 55cfa62792f327f9ffd43e9f97a0b3c88ae701f0 Mon Sep 17 00:00:00 2001 +From 8e428f28588ca55eb43865e7c8663d986bebba8a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 3 Apr 2019 15:38:09 +0200 -Subject: [PATCH 16/17] Update the title with the current foreground process +Subject: [PATCH 15/16] Update the title with the current foreground process Some changes by: Bill Nottingham @@ -5958,13 +5716,13 @@ index e4ba5c76..ba007835 100644 retval = G_SOURCE_REMOVE; -- -2.32.0 +2.33.1 -From 63c41ea272cdd690b1b35c2d6150110765cd2113 Mon Sep 17 00:00:00 2001 +From 0a46bb356659f67625a8056c463df233a3faa831 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 27 Feb 2020 19:32:08 +0100 -Subject: [PATCH 17/17] screen, window: Preserve current toolbox, if any +Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any This relies on toolbox(1) emitting a terminal escape sequence that advertises the name of the current toolbox container. @@ -6083,5 +5841,5 @@ index 3e730bc8..e58c34f2 100644 if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW) gtk_window_present (GTK_WINDOW (window)); -- -2.32.0 +2.33.1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index d2d9fc7..cac6be0 100644 --- 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.42.0 +Version: 3.42.1 Release: 1%{?dist} Summary: Terminal emulator for GNOME @@ -107,6 +107,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Wed Nov 03 2021 David King - 3.42.1-1 +- Update to 3.42.1 + * Tue Sep 28 2021 David King - 3.42.0-1 - Update to 3.42.0 diff --git a/sources b/sources index 0ca6ba8..904dbb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.42.0.tar.bz2) = 76513c27e045b9c96ba2f78292f514b6f206b7bcecd11f42ac5fb1525d79d3ee1615b203aecf1b8b03b021b2bd2315fbeb7e6d1b2546345c2fd7f9c8cb21ec2f +SHA512 (gnome-terminal-3.42.1.tar.bz2) = 0f15e807ff4aa7f1e0b5f4c02721bb8d36265f012b6b5d94f2255aeb904a459776218c43997390d99ce9f0b1d5e3307d4ae052434afb360214b8b520a06525d7