From 2744f1268183790484a978702ff19c57a67dc5fe Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 May 2017 09:01:57 +0200 Subject: [PATCH] Update to 3.24.2 - Rebase the translations --- .gitignore | 1 + ...minal-notify-open-title-transparency.patch | 48 +++++++++---------- gnome-terminal.spec | 6 ++- sources | 2 +- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 2bef304..dd58bec 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.23.90.tar.xz /gnome-terminal-3.24.0.tar.xz /gnome-terminal-3.24.1.tar.xz +/gnome-terminal-3.24.2.tar.xz diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch index 34d406e..b047559 100644 --- a/gnome-terminal-notify-open-title-transparency.patch +++ b/gnome-terminal-notify-open-title-transparency.patch @@ -1,4 +1,4 @@ -From 224a57a9987972ebc8601bc0e3fb429fe05aa795 Mon Sep 17 00:00:00 2001 +From a73d915e0df7d3010494255de251368b631170e8 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 2921c025596c..c41a73231bf4 100644 2.12.2 -From bba0dffcd74aa2a21996a0bc66dc2efba13d1346 Mon Sep 17 00:00:00 2001 +From a48b1ea301b01a00311718b21ab1fdd51207c6ec 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 c41a73231bf4..fb64fa89b3cc 100644 2.12.2 -From e5f19e9557fa6af1835b1d181ce04fefe0a8c0b4 Mon Sep 17 00:00:00 2001 +From 45ecb5a45a66ca9ab372eb7b5e638e8b165aa0db 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 fb64fa89b3cc..f1b1c7d1038d 100644 2.12.2 -From 7fa2aae80f40896635714a0837f6c11353817afb Mon Sep 17 00:00:00 2001 +From 89d16875f224dccd798eee978b1bc17eef77b281 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 043a7ae9c4b2..dac1663a24ec 100644 2.12.2 -From 7aa44fa51fb6e99a4f049246f6384c8b4a399645 Mon Sep 17 00:00:00 2001 +From 09a9c926b7a278e76586dbb80329ed988bca7c79 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.12.2 -From 0147d38ff26d47482b34747849f72f2f4f38e3f1 Mon Sep 17 00:00:00 2001 +From 587863f8c4960561427b84ad2b034a8c499d304e 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 2e4d1d6d669d..d0d2c93fbb1d 100644 2.12.2 -From ccdf17bf88239a9c7f4fc695c45afc310150b10a Mon Sep 17 00:00:00 2001 +From e4b87b47ce9fe7693785997b807a6b06110e05ec 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 d830149a4738..242ebe13e240 100644 2.12.2 -From da532bf631079baa95217ca12da179b878facd5c Mon Sep 17 00:00:00 2001 +From 72847424c8e1c78c1522a08d24c7bf0ea03f166c 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.12.2 -From 741fb3722047c756c67ff27a94a9c3d2c9211ff3 Mon Sep 17 00:00:00 2001 +From 52f12c3b6ad1a2a61c2769cb93da603952606334 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 f3b4013d6157..133c2309e8a8 100644 2.12.2 -From 00570b0be436f39a2ad536575f9b4ccfbf5a0092 Mon Sep 17 00:00:00 2001 +From f2277654e7872f187312907c866e50b8ed5fc8c5 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 b5674d8001fb..ae03835a812a 100644 2.12.2 -From bf012328565cf15bd57b0fb887a3fa69e778427d Mon Sep 17 00:00:00 2001 +From 6d1ee8b03a9ed32ba2c3463a505a58a33ea655f9 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 @@ -2203,16 +2203,16 @@ index 586c1e4d827b..08fbdb7b78e7 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/be.po b/po/be.po -index 1e45906547be..cd3fe0b7b6b2 100644 +index d5ea39c55af4..16fdbb5e51d7 100644 --- a/po/be.po +++ b/po/be.po -@@ -2015,3 +2015,6 @@ msgstr "" - msgid "C_lose Window" - msgstr "_Закрыць акно" +@@ -2365,3 +2365,6 @@ msgstr "_Закрыць акно" + #~ msgid "_Set Title…" + #~ msgstr "Прызначыць _загаловак..." ++ +msgid "Transparent background" +msgstr "Празрысты фон" -+ diff --git a/po/be@latin.po b/po/be@latin.po index 82ef0664ae1e..27e9877f96e8 100644 --- a/po/be@latin.po @@ -4540,10 +4540,10 @@ index 158f6cb167cc..a3494fb70bd6 100644 #: ../src/gnome-terminal.glade2.h:86 msgid "_Update login records when command is launched" diff --git a/po/sr.po b/po/sr.po -index a64522bc0178..05721742b3d6 100644 +index 58f21ac8c7d8..05cee5fd05b3 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2378,10 +2378,9 @@ msgstr "_Затвори прозор" +@@ -2307,10 +2307,9 @@ msgstr "_Затвори прозор" #~ msgid "GNOME Terminal Client" #~ msgstr "Клијент Гномовог терминала" @@ -4557,7 +4557,7 @@ index a64522bc0178..05721742b3d6 100644 #~ msgid "Title for terminal" #~ msgstr "Наслов за терминал" -@@ -2427,11 +2426,11 @@ msgstr "_Затвори прозор" +@@ -2356,11 +2355,11 @@ msgstr "_Затвори прозор" #~ msgid "Default size:" #~ msgstr "Основна величина:" @@ -4573,7 +4573,7 @@ index a64522bc0178..05721742b3d6 100644 #~ msgid "Title and Command" #~ msgstr "Наслов и наредба" -@@ -2439,14 +2438,14 @@ msgstr "_Затвори прозор" +@@ -2368,14 +2367,14 @@ msgstr "_Затвори прозор" #~ msgid "_Unlimited" #~ msgstr "_Неограничено" @@ -4592,7 +4592,7 @@ index a64522bc0178..05721742b3d6 100644 #~ msgid "Always visible" #~ msgstr "Увек видљив" -@@ -2468,3 +2467,6 @@ msgstr "_Затвори прозор" +@@ -2397,3 +2396,6 @@ msgstr "_Затвори прозор" #~ msgid "Close Window" #~ msgstr "Затвори прозор" @@ -5242,7 +5242,7 @@ index fb3fda0be7d6..bb73a0c743a9 100644 2.12.2 -From 34085b300c72336c45b8bb8de80cd892caa60d52 Mon Sep 17 00:00:00 2001 +From a20e4c331eca4f4b6445aeeebdc2548c415941ea 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 @@ -5459,7 +5459,7 @@ index 242ebe13e240..d56b82f0301d 100644 2.12.2 -From da6d9dbc3a1a067dfb3c7e0e6e039335f6370287 Mon Sep 17 00:00:00 2001 +From a294e2425db1ef74f756f9ad37299a6882df59c9 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 @@ -5489,7 +5489,7 @@ index ae03835a812a..5a4c100b629c 100644 2.12.2 -From db09efbb45b7f29568d6b321b485a726a8bc9268 Mon Sep 17 00:00:00 2001 +From feab011056f8495944ee700472dd97eeea5afc89 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 b5aa6f4..2809742 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -6,7 +6,7 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.24.1 +Version: 3.24.2 Release: 1%{?dist} Summary: Terminal emulator for GNOME @@ -109,6 +109,10 @@ fi %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Thu May 11 2017 Kalev Lember - 3.24.2-1 +- Update to 3.24.2 +- Rebase the translations + * Thu Apr 13 2017 Kalev Lember - 3.24.1-1 - Update to 3.24.1 - Rebase the translations diff --git a/sources b/sources index 377a278..5bfccf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.24.1.tar.xz) = e0f461d10d715bb872ebea667b23909d074371c779a982ce779921784974a20d8f6d5e65dc56b75956c4c8453353e793bd524b01214920b052bf74d0f06b619b +SHA512 (gnome-terminal-3.24.2.tar.xz) = 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93