From f0e1b4c5d0b201ac6a3076b23f9341483f80decf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 12 Oct 2017 14:38:25 +0200 Subject: [PATCH] Update to 3.26.1 - Rebase the translations --- .gitignore | 1 + ...minal-notify-open-title-transparency.patch | 54 +++++++++---------- gnome-terminal.spec | 8 ++- sources | 2 +- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index ef14abf..b3d3d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.24.1.tar.xz /gnome-terminal-3.24.2.tar.xz /gnome-terminal-3.26.0.tar.xz +/gnome-terminal-3.26.1.tar.xz diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch index 949ac84..8870632 100644 --- a/gnome-terminal-notify-open-title-transparency.patch +++ b/gnome-terminal-notify-open-title-transparency.patch @@ -1,4 +1,4 @@ -From 7778fb9077b2cf00507dac367d60dd9d2c856396 Mon Sep 17 00:00:00 2001 +From 19ec37b0aeba7be53f9bd6e40014de9fe589d4ca Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 01/14] Restore transparency @@ -228,7 +228,7 @@ index 2719708e20d4..fbc813dd9d7d 100644 2.14.1 -From 86ff684b5e06553127011b7adb7d949c1c2476f9 Mon Sep 17 00:00:00 2001 +From ed61f20e3c9fbf0d279f15c9b3bc0c680360aae8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 02/14] window: Make the drawing robust across all themes @@ -290,7 +290,7 @@ index fbc813dd9d7d..287fc95588ca 100644 2.14.1 -From 592615a2f58d95adc1e22eb769825e1450fec4ab Mon Sep 17 00:00:00 2001 +From 3c6b372069767d1987eebd79020bbf8929dc4a6d Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 03/14] screen, window: Extra padding around transparent @@ -417,7 +417,7 @@ index 287fc95588ca..e5425d5b0aa7 100644 2.14.1 -From 94c0a0dd5420d19707e3b317989aca388335257a Mon Sep 17 00:00:00 2001 +From 856db0d45b4ddb5a3721c59cf778a40e70f7ef73 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 27 Feb 2017 16:53:51 +0100 Subject: [PATCH 04/14] screen: Silence -Wunused variable @@ -443,7 +443,7 @@ index c502bd1e6a67..c67de274f8a1 100644 2.14.1 -From 3febd96a694f747eb0375be157bd5ebdac342ae5 Mon Sep 17 00:00:00 2001 +From e0afe9b5612223acd2768665f2a2ba2b5fcef282 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 27 Jan 2015 18:40:13 +0100 Subject: [PATCH 05/14] Support desktop notifications from OSC 777 @@ -765,7 +765,7 @@ index 20cfbceb36b0..a987025e0524 100644 2.14.1 -From 0c8fc828475d7ff669803606893ee27156f1b146 Mon Sep 17 00:00:00 2001 +From 4635c4bdedfab5858d7a52252a8b66026591eaf4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 11:47:21 +0100 Subject: [PATCH 06/14] Sprinkle debug messages for notifications @@ -848,7 +848,7 @@ index 6c96227c2f20..897147903240 100644 2.14.1 -From bd5602708f7ad2cfaba5cb46a6e9496dfb7e57ab Mon Sep 17 00:00:00 2001 +From cb44f848aec220b83b55ab44b5e8435b59538b14 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 May 2016 21:08:55 +0200 Subject: [PATCH 07/14] Restore separate menuitems for opening tabs and windows @@ -1171,7 +1171,7 @@ index 95f556e829d9..a5fe7dc340c5 100644 2.14.1 -From c03b09fc7e7dbedbb3fa57ec82da48b754dd6af9 Mon Sep 17 00:00:00 2001 +From 9056fffdda8ac265a460014d879ef878df528eb2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 1 Nov 2016 13:10:01 +0100 Subject: [PATCH 08/14] Revert "profile: Remove the "Command" sub-heading" @@ -1457,7 +1457,7 @@ index e1cb3470d0ee..0c09bb08c202 100644 2.14.1 -From 041d149aba66771e182d0df2eea864a5261b6ea3 Mon Sep 17 00:00:00 2001 +From 44cd94deb56267fcae9ddf7a694e9f82ef70376f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 Subject: [PATCH 09/14] Revert "screen: Remove unused description and @@ -1639,7 +1639,7 @@ index 2e8f6dc650a4..f36f567a21e7 100644 2.14.1 -From 85e3a82c2603cbaf39a77aa1309c447be3030020 Mon Sep 17 00:00:00 2001 +From cdbb0a7f2949e5661b744832809f25eccdcc9a1f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 Subject: [PATCH 10/14] Revert "Remove the static title setting from profile @@ -1853,7 +1853,7 @@ index 113dfe04be0d..212ab218eb00 100644 2.14.1 -From 4586a362138529a63ddbf466e1cc87da5232b6d3 Mon Sep 17 00:00:00 2001 +From 1b2d323a7ded1877c6210ae915ee3563cf4cb3bd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 11/14] Restore translations for setting a title and @@ -2542,10 +2542,10 @@ index d97e6102b850..a768fe4adc54 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index 93e6d889d828..88b4a2c3d003 100644 +index d4d2e487df32..0f901ad6cbae 100644 --- a/po/el.po +++ b/po/el.po -@@ -2447,23 +2447,23 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2484,23 +2484,23 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "Default size:" #~ msgstr "Προεπιλεγμένο μέγεθος:" @@ -2577,7 +2577,7 @@ index 93e6d889d828..88b4a2c3d003 100644 #~ msgid "_Next Tab" #~ msgstr "_Επόμενη καρτέλα" -@@ -2522,3 +2522,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2559,3 +2559,6 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -2852,10 +2852,10 @@ index f3aab7879a6f..315bb804e46e 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/fa.po b/po/fa.po -index cb551a1ecd07..bcc820444edd 100644 +index 8b0ca26eebe5..8a48e03f28cb 100644 --- a/po/fa.po +++ b/po/fa.po -@@ -2363,8 +2363,8 @@ msgstr "_بستن پنجره" +@@ -2402,8 +2402,8 @@ msgstr "_بستن پنجره" #~ msgid "Use custom default terminal si_ze" #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض" @@ -2866,7 +2866,7 @@ index cb551a1ecd07..bcc820444edd 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:" -@@ -2387,8 +2387,8 @@ msgstr "_بستن پنجره" +@@ -2426,8 +2426,8 @@ msgstr "_بستن پنجره" #~ msgid "Close Window" #~ msgstr "بستن پنجره" @@ -2877,7 +2877,7 @@ index cb551a1ecd07..bcc820444edd 100644 #~ msgid "Switch to Tab 2" #~ msgstr "تعویض به زبانه‌ی ۲" -@@ -2435,8 +2435,8 @@ msgstr "_بستن پنجره" +@@ -2474,8 +2474,8 @@ msgstr "_بستن پنجره" #~ msgid "_Close Window" #~ msgstr "بس_تن پنجره" @@ -2888,7 +2888,7 @@ index cb551a1ecd07..bcc820444edd 100644 #~ msgid "_Next Tab" #~ msgstr "زبانه‌ی _بعدی" -@@ -2447,5 +2447,8 @@ msgstr "_بستن پنجره" +@@ -2486,5 +2486,8 @@ msgstr "_بستن پنجره" #~ msgid "_Input Methods" #~ msgstr "روش‌های _ورودی" @@ -3344,10 +3344,10 @@ index 28a794245edc..da8becc775e5 100644 +msgid "_Set Title…" +msgstr "_Atur Judul…" diff --git a/po/it.po b/po/it.po -index 9b8b23c72d0c..1761b0901aab 100644 +index d0c44222b261..57cdb749b990 100644 --- a/po/it.po +++ b/po/it.po -@@ -2337,3 +2337,18 @@ msgstr "" +@@ -2332,3 +2332,18 @@ msgstr "" #: ../src/terminal-window.c:3953 msgid "C_lose Window" msgstr "Chiudi _finestra" @@ -4249,11 +4249,11 @@ index 23d40cf63e30..9386940431dd 100644 #~ msgid "_Unlimited" #~ msgstr "_Neliminat" diff --git a/po/ru.po b/po/ru.po -index 84c4e76ed0bf..e8e53a7c88af 100644 +index 5cb6bfdebe44..438e9b8dbe7b 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2274,3 +2274,22 @@ msgstr "" - #: ../src/terminal-window.c:3852 +@@ -2304,3 +2304,22 @@ msgstr "" + #: ../src/terminal-window.c:3953 msgid "C_lose Window" msgstr "_Закрыть окно" + @@ -5128,7 +5128,7 @@ index f5e3110135c3..f9d7c6449a3e 100644 2.14.1 -From f8f02e8daea036824de0788195977359fe4a75ef Mon Sep 17 00:00:00 2001 +From 0fc9f8bbc9d9a4cde9c670e73c697cd3555e9ab3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 Subject: [PATCH 12/14] Restore the action and shortcut to set a static title @@ -5345,7 +5345,7 @@ index a5fe7dc340c5..0b383d000330 100644 2.14.1 -From 8792ce5d075ddee775a6fb8544aeb090e198be68 Mon Sep 17 00:00:00 2001 +From e953ef8f78fbc4fe47923c6801969dcd5cda8272 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 Subject: [PATCH 13/14] screen: Style fix @@ -5375,7 +5375,7 @@ index 212ab218eb00..8889033e8f40 100644 2.14.1 -From 684b5836d103d8ff801557754c133a64c73f988f Mon Sep 17 00:00:00 2001 +From f3719ef72629cbbe47f609197712416b0f225394 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 Subject: [PATCH 14/14] Restore the rest of the title handling options and make diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 72f0a61..81bb696 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -2,11 +2,11 @@ %define glib2_version 2.42.0 %define gtk3_version 3.20.0 -%define vte_version 0.50.0 +%define vte_version 0.50.1 %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.26.0 +Version: 3.26.1 Release: 1%{?dist} Summary: Terminal emulator for GNOME @@ -109,6 +109,10 @@ fi %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Thu Oct 12 2017 Kalev Lember - 3.26.1-1 +- Update to 3.26.1 +- Rebase the translations + * Thu Sep 14 2017 Kalev Lember - 3.26.0-1 - Update to 3.26.0 - Rebase downstream patches diff --git a/sources b/sources index 735f3f7..e69cfea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.26.0.tar.xz) = 13e87fd0bfa5ebed9c8f91e9a57880b0d5b67adc31de6119e7547e4f3f84442e009f1fb9f525f5c1ccdf011bdc6f95c97cf8dab0760fe596a200860ffa880627 +SHA512 (gnome-terminal-3.26.1.tar.xz) = 25eb3c8263b8b43eac5675119ae8ca76547a84bfe91ca1db67ab6560854d760696ad59a355511a3e353d6d883d1a21a538f108dbc110a9dc685ff4a8a9fbc65d