rpms/gnome-terminal
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.40.1

Browse Source 
- Rebase the translations
- Backport yet-to-be-released patches from upstream to avoid
  translation conflicts
This commit is contained in:
Debarshi Ray 2021-05-11 13:18:57 +02:00
parent 0b5dcdee11
commit a522677eee
5 changed files with 1777 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

1714
gnome-terminal-backports-from-upstream.patch Normal file
View File

File diff suppressed because it is too large Load Diff

103
gnome-terminal-cntr-ntfy-autottl-ts.patch
View File

@ -1,4 +1,4 @@
From 99a1675f39a6759d1e2efaf5d8d40e40ed7b55ea Mon Sep 17 00:00:00 2001
From 70c75d16f4124b9ee8f219b9ce42e25d1a52d81d 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
@ -234,7 +234,7 @@ index 537cd2e1d8b1..d87bbb6f24ec 100644
2.30.2
From 384e9793eecada5762ef1dbc8cb93a3a2fd418a5 Mon Sep 17 00:00:00 2001
From b25b0df8b4a9f1e5c9d071ca747bce01cb3f6466 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.30.2
From acdd027f3c5321862a7a4da718e7605e59453882 Mon Sep 17 00:00:00 2001
From 723cff566e0f1f7a31b020b2aba39066f4cc070b 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.30.2
From a7dc6d373d6a9986ad17be62662d5eac526daedc Mon Sep 17 00:00:00 2001
From e4ae7323aa2c8cf91790b6e23ed44209f9ef8888 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.30.2
From 9eccb5af196344a5d75c9a4ee41c49a7ea5a8e78 Mon Sep 17 00:00:00 2001
From d5f4d6925e69a6e9f608615bef38f92c1ef71ac6 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.30.2
From 1e28f63c8bb7097b93e8c43e342612d5c6d64273 Mon Sep 17 00:00:00 2001
From 3348b25d12ea2fc72843ba7326b6fa266031b69e 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
@ -1074,7 +1074,7 @@ index 20cfbceb36b0..a987025e0524 100644
2.30.2
From 656dd8a914aba491703c4a7d82eefa7ba91b9814 Mon Sep 17 00:00:00 2001
From a4595840170ac9457717989da7b07dee653740e0 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.30.2
From a9c8583804a87b13e96e90168356665d012b668d Mon Sep 17 00:00:00 2001
From 0c4d86519524ddf002999c6f3b214c2b41bb3678 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.30.2
From 1772400ec03303c7d40a4884a04c23d7305bb9d9 Mon Sep 17 00:00:00 2001
From 47807c171a1df778f0d7a3a9e23ff174c3e80f2e 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.30.2
From d528f225099dea1c224312ddd23b8d79a62244f4 Mon Sep 17 00:00:00 2001
From 60da29daf408667dcbbdf51f4830c0eed8c1495b 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
@ -2000,7 +2000,7 @@ index 7f237b3b46b7..a3386dac16b5 100644
2.30.2
From 329777e1c28f87af2971c27172b478aa759fe4c0 Mon Sep 17 00:00:00 2001
From 842429b887b6b14b878e7e4a2fd00475962c5714 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
@ -2067,7 +2067,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/ms.po | 4 ++--
po/nb.po | 12 ++++++++++++
po/nds.po | 8 ++++----
po/ne.po | 12 ++++++------
po/ne.po | 11 +++++++----
po/nl.po | 12 ++++++++++++
po/nn.po | 8 ++++----
po/oc.po | 12 ++++++------
@ -2099,7 +2099,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/zh_CN.po | 15 +++++++++------
po/zh_HK.po | 15 +++++++++------
po/zh_TW.po | 15 +++++++++------
92 files changed, 719 insertions(+), 343 deletions(-)
92 files changed, 720 insertions(+), 341 deletions(-)
diff --git a/po/am.po b/po/am.po
index 3445d96da657..ee992f0712a5 100644
@ -2608,10 +2608,10 @@ index d97e6102b850..a768fe4adc54 100644
#: ../src/profile-preferences.glade.h:78
#, fuzzy
diff --git a/po/el.po b/po/el.po
index 3e44ba5d24f6..f93ecb561ef4 100644
index 0b489324247f..4a1d02727c5b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2888,17 +2888,17 @@ msgstr "Κ_λείσιμο παραθύρου"
@@ -2895,17 +2895,17 @@ msgstr "Κ_λείσιμο παραθύρου"
#~ msgid "Default size:"
#~ msgstr "Προεπιλεγμένο μέγεθος:"
@ -2635,7 +2635,7 @@ index 3e44ba5d24f6..f93ecb561ef4 100644
#~ msgid "Current Locale"
#~ msgstr "Τρέχουσα τοπική ρύθμιση"
@@ -2936,3 +2936,6 @@ msgstr "Κ_λείσιμο παραθύρου"
@@ -2943,3 +2943,6 @@ msgstr "Κ_λείσιμο παραθύρου"
#~ msgid "_Input Methods"
#~ msgstr "_Μέθοδοι εισαγωγής"
@ -2695,10 +2695,10 @@ index 6c9e0cd73d63..db4aa891dd45 100644
#: ../src/gnome-terminal.glade2.h:87
msgid "_Update login records when command is launched"
diff --git a/po/en_GB.po b/po/en_GB.po
index d2542ff7db4a..dc3bdf23ca9e 100644
index efa4f808efa5..8d6a061aa3f2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2828,8 +2828,8 @@ msgstr "C_lose Window"
@@ -2837,8 +2837,8 @@ msgstr "C_lose Window"
#~ msgid "Default size:"
#~ msgstr "Default size:"
@ -2709,7 +2709,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644
#~ msgid "When terminal commands set their o_wn titles:"
#~ msgstr "When terminal commands set their o_wn titles:"
@@ -2846,8 +2846,8 @@ msgstr "C_lose Window"
@@ -2855,8 +2855,8 @@ msgstr "C_lose Window"
#~ msgid "_Unlimited"
#~ msgstr "_Unlimited"
@ -2720,7 +2720,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644
#~ msgid "Switch to Tab 3"
#~ msgstr "Switch to Tab 3"
@@ -2888,8 +2888,8 @@ msgstr "C_lose Window"
@@ -2897,8 +2897,8 @@ msgstr "C_lose Window"
#~ msgid "_Input Methods"
#~ msgstr "_Input Methods"
@ -2731,7 +2731,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644
#~ msgid "Add or Remove Terminal Encodings"
#~ msgstr "Add or Remove Terminal Encodings"
@@ -3584,8 +3584,8 @@ msgstr "C_lose Window"
@@ -3593,8 +3593,8 @@ msgstr "C_lose Window"
#~ msgid "Background image _scrolls"
#~ msgstr "Background image _scrolls"
@ -3037,10 +3037,10 @@ index 76b459cf8dc5..485beeac98b7 100644
#~ msgid "No such profile \"%s\", using default profile\n"
#~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n"
diff --git a/po/he.po b/po/he.po
index ad00c9109e41..82fc3c9573e1 100644
index 5d54080e0e46..d4a1c10ced1a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2769,17 +2769,17 @@ msgstr "סגירת ה_חלון"
@@ -2776,17 +2776,17 @@ msgstr "סגירת ה_חלון"
#~ msgid "Default size:"
#~ msgstr "גודל בררת מחדל:"
@ -3064,7 +3064,7 @@ index ad00c9109e41..82fc3c9573e1 100644
#~ msgid "Current Locale"
#~ msgstr "השפה הנוכחית"
@@ -3591,8 +3591,8 @@ msgstr "סגירת ה_חלון"
@@ -3598,8 +3598,8 @@ msgstr "סגירת ה_חלון"
#~ msgid "_Solid color"
#~ msgstr "צבע _אחיד"
@ -3659,10 +3659,10 @@ index 82f930b1cc0c..d52fbd94eb58 100644
#: ../src/profile-preferences.glade.h:74
msgid "_Update login records when command is launched"
diff --git a/po/ne.po b/po/ne.po
index 4fe16cc88a9a..53fb89134be0 100644
index 901aa9549be0..48b9b219369e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
@@ -2769,8 +2769,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
#~ msgid "_None (use solid color)"
#~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)"
@ -3673,18 +3673,17 @@ index 4fe16cc88a9a..53fb89134be0 100644
#~ msgid "_Use the system fixed width font"
#~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्"
@@ -3052,8 +3052,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
#~ msgid "Close Tab"
#~ msgstr "ट्याब बन्द गर्नुहोस्"
@@ -3251,6 +3251,9 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
#~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge."
#~ msgstr "तपाईँले क्लिक गरेको पाठ वैध OTP चुनौती नहुने देखिन्छ ।"
-#~ msgid "Set Title"
-#~ msgstr "शीर्षक सेट गर्नुहोस्"
+msgid "Set Title"
+msgstr "शीर्षक सेट गर्नुहोस्"
+
#~ msgid "Switch to Tab 3"
#~ msgstr "ट्याब ३ मा स्विच गर्नुहोस्"
#~ msgid "Switch to Tab 2"
#~ msgstr "ट्याब २ मा स्विच गर्नुहोस्"
@@ -3232,8 +3232,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
@@ -3388,8 +3391,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
#~ msgid "_Input Methods"
#~ msgstr "आगत विधि"
@ -3693,13 +3692,13 @@ index 4fe16cc88a9a..53fb89134be0 100644
+msgid "_Title:"
+msgstr "शीर्षक:"
#~ msgid ""
#~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n"
#~ msgid "text/plain dropped on terminal had wrong format (%d) or length (%d)\n"
#~ msgstr "टर्मिनलमा छोडिएको पाठ/सादा गलत ढाँचा (%d) वा लम्बाइ (%d)को थियो\n"
diff --git a/po/nl.po b/po/nl.po
index b493d43bbbaf..e97079afacad 100644
index 215774cf23be..c5df70c52aac 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2776,3 +2776,15 @@ msgstr "Venster sl_uiten"
@@ -2786,3 +2786,15 @@ msgstr "Venster sl_uiten"
#~ msgid "_Add or Remove…"
#~ msgstr "_Toevoegen of verwijderen…"
@ -3876,10 +3875,10 @@ index b25a2cb41712..3855b2f3423f 100644
#: ../src/profile-preferences.glade.h:70
msgid "_Update login records when command is launched"
diff --git a/po/pt.po b/po/pt.po
index b23cf2412bdd..bef52c9cfc60 100644
index 280fce039ade..a67e810bcc0e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2825,11 +2825,11 @@ msgstr "Fechar jane_la"
@@ -2823,11 +2823,11 @@ msgstr "Fechar jane_la"
#~ msgid "Default size:"
#~ msgstr "Tamanho predefinido:"
@ -3895,7 +3894,7 @@ index b23cf2412bdd..bef52c9cfc60 100644
#~ msgid "Title and Command"
#~ msgstr "Título e comando"
@@ -2837,8 +2837,8 @@ msgstr "Fechar jane_la"
@@ -2835,8 +2835,8 @@ msgstr "Fechar jane_la"
#~ msgid "_Unlimited"
#~ msgstr "_Ilimitado"
@ -3906,7 +3905,7 @@ index b23cf2412bdd..bef52c9cfc60 100644
#~ msgid "Current Locale"
#~ msgstr "Configuração Regional Atual"
@@ -3592,8 +3592,8 @@ msgstr "Fechar jane_la"
@@ -3590,8 +3590,8 @@ msgstr "Fechar jane_la"
#~ msgid "Background image _scrolls"
#~ msgstr "Imagem de fundo _rola"
@ -4518,10 +4517,10 @@ index 2540955ef92e..ab8fb252af3d 100644
+msgid "Transparent background"
+msgstr "Прозоре тло"
diff --git a/po/vi.po b/po/vi.po
index d5f27612f4be..8bb576b6d875 100644
index 5304429b4674..af014ff2473e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2703,8 +2703,8 @@ msgstr "Đón_g cửa sổ"
@@ -2852,8 +2852,8 @@ msgstr "Đón_g cửa sổ"
#~ msgid "Default size:"
#~ msgstr "Cỡ mặc định:"
@ -4532,7 +4531,7 @@ index d5f27612f4be..8bb576b6d875 100644
#~ msgid "When terminal commands set their o_wn titles:"
#~ msgstr "Khi câu lệnh thiết bị cuối tự đặt tựa đề _mình:"
@@ -2715,8 +2715,8 @@ msgstr "Đón_g cửa sổ"
@@ -2864,8 +2864,8 @@ msgstr "Đón_g cửa sổ"
#~ msgid "_Unlimited"
#~ msgstr "_Không hạn chế"
@ -4543,7 +4542,7 @@ index d5f27612f4be..8bb576b6d875 100644
#~ msgid "Switch to Tab 3"
#~ msgstr "Chuyển sang Thanh 3"
@@ -2757,8 +2757,8 @@ msgstr "Đón_g cửa sổ"
@@ -2906,8 +2906,8 @@ msgstr "Đón_g cửa sổ"
#~ msgid "_Input Methods"
#~ msgstr "K_iểu gõ"
@ -4554,7 +4553,7 @@ index d5f27612f4be..8bb576b6d875 100644
#~ msgid "Disable connection to session manager"
#~ msgstr "Tắt kết nối đến trình quản lý phiên làm việc"
@@ -3143,3 +3143,6 @@ msgstr "Đón_g cửa sổ"
@@ -3292,3 +3292,6 @@ msgstr "Đón_g cửa sổ"
#~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng "
#~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị "
#~ "tắt), nghĩa là không có phím tắt cho hành động này."
@ -4744,7 +4743,7 @@ index 80cb23434a60..20e2a93ce3f0 100644
2.30.2
From 235e3eb64b3c45d5a23b47b27f45e78ff03f72e8 Mon Sep 17 00:00:00 2001
From 3c1f5551e5db30e1194b8d50e224c2d7aef9b54a 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
@ -4892,7 +4891,7 @@ index 6d1fa95d8b3a..69596045d43e 100644
2.30.2
From de8562aee6f179ddcc07639e96b843208881d037 Mon Sep 17 00:00:00 2001
From fec24458f5a978034b95c063e59a3a3e5a2376af 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
@ -4922,7 +4921,7 @@ index a3386dac16b5..19c265839dc7 100644
2.30.2
From 88fa3edbf55ec9737b846e00664aeee60506efff Mon Sep 17 00:00:00 2001
From 781dec0d0beeda7a313bfd46d0e2ac7704011049 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
@ -5539,7 +5538,7 @@ index 69596045d43e..b8ab17eac3c5 100644
2.30.2
From 274edc3e1ab0c9a8487618d6baeb57d1a6df0452 Mon Sep 17 00:00:00 2001
From 67eddc128168422b34cc30ca77d2b10755110ffd 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
@ -5714,7 +5713,7 @@ index c715e592a19a..8566312b879e 100644
2.30.2
From 319c20bcf9781bb021820ac0ff1223063e1e72b6 Mon Sep 17 00:00:00 2001
From 209c613cbd506c517a089f946fa4122212ba2f94 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

11
gnome-terminal.spec
View File

@ -7,7 +7,7 @@
%define desktop_file_utils_version 0.2.90
Name: gnome-terminal
Version: 3.40.0
Version: 3.40.1
Release: 1%{?dist}
Summary: Terminal emulator for GNOME
@ -16,6 +16,8 @@ URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/gnome-terminal/3.40/gnome-terminal-%{version}.tar.xz
Source1: org.gnome.Terminal.gschema.override
Patch0: gnome-terminal-backports-from-upstream.patch
Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch
Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch
@ -62,6 +64,7 @@ option to the right-click context menu in Nautilus.
%prep
%setup -q
%patch0 -p1 -b .backports
%patch100 -p1 -b .cntr-ntfy-autottl-ts
%patch101 -p1 -b .warnings
@ -111,6 +114,12 @@ make check
%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Tue May 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.1-1
- Update to 3.40.1
- Rebase the translations
- Backport yet-to-be-released patches from upstream to avoid translation
conflicts
* Tue May 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.0-1
- Update to 3.40.0

2
sources
View File

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