diff --git a/.gitignore b/.gitignore index 3f19ccb..23f1e93 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.20.1.tar.xz /gnome-terminal-3.20.2.tar.xz /gnome-terminal-3.21.90.tar.xz +/gnome-terminal-3.21.92.tar.xz diff --git a/0001-Revert-window-Fix-CSD-size-calculations-with-long-ti.patch b/0001-Revert-window-Fix-CSD-size-calculations-with-long-ti.patch deleted file mode 100644 index 613b052..0000000 --- a/0001-Revert-window-Fix-CSD-size-calculations-with-long-ti.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 441aece5b5f012c04307fe6df652ffaea1eeda0a Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Wed, 17 Aug 2016 08:20:19 +0200 -Subject: [PATCH] Revert "window: Fix CSD size calculations with long titles" - -This reverts commit 40d9d5b78067caa6a28e83e32b87c0b51d14c091. - -The commit introduced a regression on non-CSD, see -https://bugzilla.gnome.org/show_bug.cgi?id=769898#c5 ---- - src/terminal-window.c | 34 ++++++++++++---------------------- - 1 file changed, 12 insertions(+), 22 deletions(-) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index b86e76f..46676a5 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -3615,11 +3615,11 @@ terminal_window_update_geometry (TerminalWindow *window) - GtkWidget *widget; - GdkGeometry hints; - GtkBorder padding; -- GtkRequisition vbox_request, widget_request; -+ GtkRequisition toplevel_request, vbox_request, widget_request; - int grid_width, grid_height; - int char_width, char_height; - int chrome_width, chrome_height; -- int csd_width = 0, csd_height = 0; -+ int csd_width, csd_height; - - if (priv->active_screen == NULL) - return; -@@ -3650,30 +3650,20 @@ terminal_window_update_geometry (TerminalWindow *window) - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "content area requests %dx%d px\n", - vbox_request.width, vbox_request.height); - -+ gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "window requests %dx%d px\n", -+ toplevel_request.width, toplevel_request.height); - - chrome_width = vbox_request.width - (char_width * grid_width); - chrome_height = vbox_request.height - (char_height * grid_height); - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "chrome: %dx%d px\n", - chrome_width, chrome_height); - -- if (priv->realized) -- { -- /* Only when having been realize the CSD can be calculated. Do this by -- * using the actual allocation rather then the preferred size as the -- * the preferred size takes the natural size of e.g. the title bar into -- * account which can be far wider then the contents size when using a -- * very long title */ -- GtkAllocation toplevel_allocation; -- -- gtk_widget_get_allocation (GTK_WIDGET (window), &toplevel_allocation); -- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "window allocation %dx%d px\n", -- toplevel_allocation.width, toplevel_allocation.height); -- -- csd_width = toplevel_allocation.width - vbox_request.width; -- csd_height = toplevel_allocation.height - vbox_request.height; -- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "CSDs: %dx%d px\n", -- csd_width, csd_height); -- } -+ csd_width = toplevel_request.width - vbox_request.width; -+ csd_height = toplevel_request.height - vbox_request.height; -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "CSDs: %dx%d px%s\n", -+ csd_width, csd_height, -+ priv->realized ? "" : " (just a guess)"); - - gtk_widget_get_preferred_size (widget, NULL, &widget_request); - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "terminal widget requests %dx%d px\n", -@@ -3682,8 +3672,8 @@ terminal_window_update_geometry (TerminalWindow *window) - if (!priv->realized) - { - /* Don't actually set the geometry hints until we have been realized, -- * because we don't know how large the client-side decorations are going -- * to be. We also avoid setting priv->old_csd_width or -+ * because we don't know precisely how large the client-side decorations -+ * are going to be. We also avoid setting priv->old_csd_width or - * priv->old_csd_height, so that next time through this function we'll - * definitely recalculate the hints. - * --- -2.7.4 - diff --git a/gnome-terminal-transparency-notify.patch b/gnome-terminal-transparency-notify.patch index f4e37cf..b249aa5 100644 --- a/gnome-terminal-transparency-notify.patch +++ b/gnome-terminal-transparency-notify.patch @@ -1,4 +1,4 @@ -From 45b796a6e499ece54e2b9bc7e61e008f03826acf Mon Sep 17 00:00:00 2001 +From a53f87d75c18ff2c494d67cd746940728b666a27 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 1/6] Restore transparency @@ -44,10 +44,10 @@ index c031c8ace24a..7bdd156e36aa 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c -index 82cc7a9a36b7..fd5f55c93d0c 100644 +index 002561d77dcb..1a758a9243ec 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c -@@ -1213,7 +1213,18 @@ terminal_profile_edit (GSettings *profile, +@@ -1215,7 +1215,18 @@ terminal_profile_edit (GSettings *profile, "active-id", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); @@ -67,7 +67,7 @@ index 82cc7a9a36b7..fd5f55c93d0c 100644 terminal_util_dialog_focus_widget (editor, widget_name); diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui -index 9c0094687ffd..9caf72da0f14 100644 +index 5adcb5317e01..b7decb284946 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -23,6 +23,11 @@ @@ -82,7 +82,7 @@ index 9c0094687ffd..9caf72da0f14 100644 -@@ -1035,6 +1040,93 @@ +@@ -1036,6 +1041,93 @@ 1 @@ -245,19 +245,19 @@ index 9a0b450bd310..eab0cec3fc90 100644 static void diff --git a/src/terminal-window.c b/src/terminal-window.c -index b86e76fe69fc..f10a6e7fdfc5 100644 +index a290d9fda733..020c6f00787f 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2629,6 +2629,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2621,6 +2621,8 @@ terminal_window_init (TerminalWindow *window) TerminalWindowPrivate *priv; TerminalApp *app; TerminalSettingsList *profiles_list; + GdkScreen *screen; + GdkVisual *visual; + GSettings *gtk_debug_settings; GtkActionGroup *action_group; GtkAction *action; - GtkUIManager *manager; -@@ -2642,6 +2644,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2637,6 +2639,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -273,7 +273,7 @@ index b86e76fe69fc..f10a6e7fdfc5 100644 2.7.4 -From a5f8f917db332544efe22ac7619dc7ed3266dce7 Mon Sep 17 00:00:00 2001 +From f33e6356b5def8820857f66edf6a749d9f655192 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 2/6] window: Make the drawing robust across all themes @@ -293,10 +293,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016 1 file changed, 21 insertions(+) diff --git a/src/terminal-window.c b/src/terminal-window.c -index f10a6e7fdfc5..082a3c45f6c5 100644 +index 020c6f00787f..a9f3ff7d67e2 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2301,6 +2301,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -2295,6 +2295,26 @@ terminal_window_realize (GtkWidget *widget) } static gboolean @@ -323,7 +323,7 @@ index f10a6e7fdfc5..082a3c45f6c5 100644 terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) { -@@ -2834,6 +2854,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2832,6 +2852,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -335,7 +335,7 @@ index f10a6e7fdfc5..082a3c45f6c5 100644 2.7.4 -From 4d6ee5d8c0e06a4878890592f2bfa73513bbf04f Mon Sep 17 00:00:00 2001 +From 8c3bd414e1222ae7be01555330cd5c9352b0d7d2 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 3/6] screen, window: Extra padding around transparent @@ -427,10 +427,10 @@ index eab0cec3fc90..5d321a7c238b 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 082a3c45f6c5..f3bfbe6505d6 100644 +index a9f3ff7d67e2..d09484e40e66 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2306,15 +2306,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -2300,15 +2300,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -462,7 +462,7 @@ index 082a3c45f6c5..f3bfbe6505d6 100644 2.7.4 -From 3a74446fea3b54201676c8aa23458dff7654a341 Mon Sep 17 00:00:00 2001 +From fc463ea0c9fe73625ed33f58533ca182f4f6e3a9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 27 Jan 2015 18:40:13 +0100 Subject: [PATCH 4/6] Support desktop notifications from OSC 777 @@ -476,7 +476,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 4 files changed, 171 insertions(+), 1 deletion(-) diff --git a/src/terminal-app.c b/src/terminal-app.c -index 2d9129cb3419..4cbe2510e02d 100644 +index 6c783bc1df79..6a79e98183b3 100644 --- a/src/terminal-app.c +++ b/src/terminal-app.c @@ -374,6 +374,31 @@ app_menu_quit_cb (GSimpleAction *action, @@ -784,7 +784,7 @@ index 20cfbceb36b0..a987025e0524 100644 2.7.4 -From 2cde3630ae23286c1911bae79684a890e3062496 Mon Sep 17 00:00:00 2001 +From b2571def69942368d4c7c8ba2fadc466b62dcfb3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 11:47:21 +0100 Subject: [PATCH 5/6] Sprinkle debug messages for notifications @@ -867,7 +867,7 @@ index 6a4925f6d1b1..7c6fa77bf71a 100644 2.7.4 -From 577078a8aa6218edafafeb412d575325a79db3d3 Mon Sep 17 00:00:00 2001 +From a6553f0f68e9fcdcf902b94784d3572c48d1911a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 6/6] Restore translations for transparency @@ -918,7 +918,7 @@ Subject: [PATCH 6/6] Restore translations for transparency po/ko.po | 3 +++ po/ku.po | 4 ++-- po/lt.po | 3 +++ - po/lv.po | 3 +++ + po/lv.po | 2 ++ po/mai.po | 4 ++-- po/mg.po | 4 ++-- po/mk.po | 4 ++-- @@ -959,7 +959,7 @@ Subject: [PATCH 6/6] Restore translations for transparency po/zh_CN.po | 3 +++ po/zh_HK.po | 3 +++ po/zh_TW.po | 3 +++ - 86 files changed, 209 insertions(+), 96 deletions(-) + 86 files changed, 208 insertions(+), 96 deletions(-) diff --git a/po/am.po b/po/am.po index 3445d96da657..a5fadb3a8d48 100644 @@ -1122,11 +1122,11 @@ index 2dafab8ca90d..1c129291a084 100644 +msgid "Transparent background" +msgstr "Fons transparent" diff --git a/po/cs.po b/po/cs.po -index 4f6f0ea570c9..59d5ad11751a 100644 +index f87b88f9bb3a..c8824ff6677a 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2249,3 +2249,6 @@ msgstr "" - #: ../src/terminal-window.c:3727 +@@ -2253,3 +2253,6 @@ msgstr "" + #: ../src/terminal-window.c:3849 msgid "C_lose Window" msgstr "_Zavřít okno" + @@ -1148,10 +1148,10 @@ index 644df82363f1..f0c96e7aa85b 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/da.po b/po/da.po -index 834c72e16e50..42aa8089fac1 100644 +index 193a58c0fd14..b4f06171a842 100644 --- a/po/da.po +++ b/po/da.po -@@ -3179,8 +3179,8 @@ msgstr "_Luk vindue" +@@ -3183,8 +3183,8 @@ msgstr "_Luk vindue" #~ msgid "_Solid color" #~ msgstr "_Ensfarvet" @@ -1163,10 +1163,10 @@ index 834c72e16e50..42aa8089fac1 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/de.po b/po/de.po -index aa3289da6aa6..3c144d4caab3 100644 +index 7e098bd312ac..0f7883d58df4 100644 --- a/po/de.po +++ b/po/de.po -@@ -3259,8 +3259,8 @@ msgstr "Fenster _schließen" +@@ -3263,8 +3263,8 @@ msgstr "Fenster _schließen" #~ msgid "Background image _scrolls" #~ msgstr "Hintergrundbild _folgt Bildlauf" @@ -1193,10 +1193,10 @@ index d97e6102b850..061a09dc9edb 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index 2b0d1de8c80f..5bf36a9fdbea 100644 +index 911f7bd0483b..658b2e3201a7 100644 --- a/po/el.po +++ b/po/el.po -@@ -2510,3 +2510,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2515,3 +2515,6 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -1234,10 +1234,10 @@ index 6c9e0cd73d63..3ffa89b7cfee 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 4d38486679fe..69e71135d75c 100644 +index 2fb1448eccbe..33e1e221bd10 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2732,8 +2732,8 @@ msgstr "_Title:" +@@ -3176,8 +3176,8 @@ msgstr "C_lose Window" #~ msgid "Background image _scrolls" #~ msgstr "Background image _scrolls" @@ -1249,10 +1249,10 @@ index 4d38486679fe..69e71135d75c 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "S_hade transparent or image background:" diff --git a/po/es.po b/po/es.po -index cbb460ccb9b4..09c946bccfbe 100644 +index 70fc6fcf9a88..6b13f2449992 100644 --- a/po/es.po +++ b/po/es.po -@@ -3286,8 +3286,8 @@ msgstr "_Cerrar ventana" +@@ -3291,8 +3291,8 @@ msgstr "_Cerrar ventana" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -1315,10 +1315,10 @@ index a8cd6e1cb1f1..db7df1010def 100644 #~ msgid "Missing command" #~ msgstr "Puuttuva komento" diff --git a/po/fr.po b/po/fr.po -index d230aa20aaa6..9771335bda19 100644 +index 40019d1a82ec..71b1e9fff5e4 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2303,3 +2303,6 @@ msgstr "Fermer _la fenêtre" +@@ -2309,3 +2309,6 @@ msgstr "Fermer _la fenêtre" #~ msgid "_Same as text color" #~ msgstr "_Même couleur que le texte" @@ -1326,7 +1326,7 @@ index d230aa20aaa6..9771335bda19 100644 +msgid "Transparent background" +msgstr "Arrière-plan transparent" diff --git a/po/fur.po b/po/fur.po -index e6752a4bdb9b..f0c5f8d220dd 100644 +index ef6034af61cb..b11b3e977395 100644 --- a/po/fur.po +++ b/po/fur.po @@ -652,6 +652,10 @@ msgstr "" @@ -1352,10 +1352,10 @@ index 93d5fa9d1481..feb87dce3d6b 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index a858849ef591..7fadccd9e524 100644 +index 910f98611ab5..0abf9b4ef9d1 100644 --- a/po/gl.po +++ b/po/gl.po -@@ -3241,8 +3241,8 @@ msgstr "P_echar a xanela" +@@ -3246,8 +3246,8 @@ msgstr "P_echar a xanela" #~ msgid "Background image _scrolls" #~ msgstr "A imaxe de fondo _desprázase" @@ -1382,10 +1382,10 @@ index 76b459cf8dc5..5a0efa46233e 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" diff --git a/po/he.po b/po/he.po -index 0c2420ebc5f3..7a25a26e6abd 100644 +index 57cb2d0d110f..adca960ec997 100644 --- a/po/he.po +++ b/po/he.po -@@ -3189,8 +3189,8 @@ msgstr "סגירת ה_חלון" +@@ -3194,8 +3194,8 @@ msgstr "סגירת ה_חלון" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -1427,10 +1427,10 @@ index 6090e43c4160..7ceb550dc0ea 100644 #: ../src/profile-preferences.glade.h:70 msgid "_Update login records when command is launched" diff --git a/po/hu.po b/po/hu.po -index 381dd15fd86f..500c08a70bd9 100644 +index 8fc02debf569..b766d5ecf196 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2713,3 +2713,6 @@ msgstr "_Ablak bezárása" +@@ -2699,3 +2699,6 @@ msgstr "_Ablak bezárása" #~ msgid "Background image" #~ msgstr "Háttérkép" @@ -1453,11 +1453,11 @@ index aaf2d9b292da..c8f14dfd4280 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/id.po b/po/id.po -index d7b1700c3696..0a1be4d025aa 100644 +index b27605c49b9b..b05f2d0ecc43 100644 --- a/po/id.po +++ b/po/id.po -@@ -2248,3 +2248,6 @@ msgstr "" - #: ../src/terminal-window.c:3727 +@@ -2252,3 +2252,6 @@ msgstr "" + #: ../src/terminal-window.c:3849 msgid "C_lose Window" msgstr "Tutup Jende_la" + @@ -1499,10 +1499,10 @@ index 2a0bc91fad40..10a833ad4cad 100644 #: ../src/gnome-terminal.glade2.h:87 diff --git a/po/kk.po b/po/kk.po -index 92d0f5cd5d7a..64f742eab956 100644 +index 70caf943e846..5228536b9272 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2208,3 +2208,6 @@ msgstr "Терезені жа_бу" +@@ -2213,3 +2213,6 @@ msgstr "Терезені жа_бу" #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -1521,10 +1521,10 @@ index c887f88a2c87..e899ef3ca8c1 100644 +msgid "Transparent background" +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" diff --git a/po/ko.po b/po/ko.po -index af4d98131cd9..0b1a314c398a 100644 +index 366a5122c251..1ea4c7f519d4 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -2304,3 +2304,6 @@ msgstr "창 닫기(_L)" +@@ -2281,3 +2281,6 @@ msgstr "창 닫기(_L)" #~ msgid "Whether to use a dark theme variant" #~ msgstr "어두운 테마를 사용할 지 여부" @@ -1547,10 +1547,10 @@ index bc2bb7f03de4..226d9942f23a 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index 974c35354b07..6b1674621446 100644 +index c1c3ce0bfbab..20771d86cb86 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2310,3 +2310,6 @@ msgstr "_Užverti langą" +@@ -2280,3 +2280,6 @@ msgstr "_Užverti langą" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -1558,14 +1558,13 @@ index 974c35354b07..6b1674621446 100644 +msgid "Transparent background" +msgstr "Permatomas fonas" diff --git a/po/lv.po b/po/lv.po -index 3b0f19fa8fd5..faf2fef15cc7 100644 +index 959d1c3531fd..eb12a845f3bc 100644 --- a/po/lv.po +++ b/po/lv.po -@@ -2261,3 +2261,6 @@ msgstr "" - #: ../src/terminal-window.c:3727 +@@ -2236,3 +2236,5 @@ msgstr "" msgid "C_lose Window" msgstr "Aizvērt _logu" -+ + +msgid "Transparent background" +msgstr "Caurspīdīgs fons" diff --git a/po/mai.po b/po/mai.po @@ -1801,10 +1800,10 @@ index b25a2cb41712..dcbaf0bc6c8c 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 0de7ba0d39f9..fce6e92ec874 100644 +index 5181419ad973..2e1b84d09c52 100644 --- a/po/pt.po +++ b/po/pt.po -@@ -3193,8 +3193,8 @@ msgstr "Fechar jane_la" +@@ -3160,8 +3160,8 @@ msgstr "Fechar jane_la" #~ msgid "Background image _scrolls" #~ msgstr "Imagem de fundo _rola" @@ -1816,12 +1815,12 @@ index 0de7ba0d39f9..fce6e92ec874 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparente som_breado ou imagem de fundo:" diff --git a/po/pt_BR.po b/po/pt_BR.po -index ff624815e4a9..d87c3702f3bd 100644 +index d3e6c538a640..c56753f96ba0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -3056,3 +3056,6 @@ msgstr "_Fechar janela" - #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de " - #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato " +@@ -3057,3 +3057,6 @@ msgstr "_Fechar janela" + #~ "poderão usar. Essa é a paleta, na forma de uma lista de nomes de cores " + #~ "separada por dois pontos. Os nomes de cores devem estar no formato " #~ "hexadecimal. Exemplo: \"#FF00FF\"" + +msgid "Transparent background" @@ -1881,10 +1880,10 @@ index adca7d5acba9..64c05665429b 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 03ac832c72c9..e97eb6113a87 100644 +index 1ad43ae0cbec..f31ecee58845 100644 --- a/po/sk.po +++ b/po/sk.po -@@ -2585,3 +2585,6 @@ msgstr "_Zavrieť okno" +@@ -2590,3 +2590,6 @@ msgstr "_Zavrieť okno" #~ "\n" #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --" #~ "help“.\n" @@ -1892,10 +1891,10 @@ index 03ac832c72c9..e97eb6113a87 100644 +msgid "Transparent background" +msgstr "Priehľadné pozadie" diff --git a/po/sl.po b/po/sl.po -index d9260d63f4b2..1cffc3d23fe4 100644 +index 754abb4ba4a2..4315da71bda5 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2322,3 +2322,6 @@ msgstr "_Zapri okno" +@@ -2525,3 +2525,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -1918,10 +1917,10 @@ index 158f6cb167cc..96afc9b98fd4 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 799352b324a1..bad0c4e35343 100644 +index e229e742a550..9d0d123eacca 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2424,3 +2424,6 @@ msgstr "_Затвори прозор" +@@ -2387,3 +2387,6 @@ msgstr "_Затвори прозор" #~ msgid "Close Window" #~ msgstr "Затвори прозор" @@ -1929,10 +1928,10 @@ index 799352b324a1..bad0c4e35343 100644 +msgid "Transparent background" +msgstr "Провидна позадина" diff --git a/po/sr@latin.po b/po/sr@latin.po -index 24fb037723bc..ac66a52cb56d 100644 +index c1d3f5c94811..906cf1652a73 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po -@@ -2424,3 +2424,6 @@ msgstr "_Zatvori prozor" +@@ -2387,3 +2387,6 @@ msgstr "_Zatvori prozor" #~ msgid "Close Window" #~ msgstr "Zatvori prozor" @@ -1940,10 +1939,10 @@ index 24fb037723bc..ac66a52cb56d 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 38b942608ca7..0ad3def03714 100644 +index c5da2a0487a8..ef20882c9e2c 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2281,5 +2281,8 @@ msgstr "Stän_g fönster" +@@ -2288,5 +2288,8 @@ msgstr "Stän_g fönster" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -1983,10 +1982,10 @@ index 82c0e0fc8f54..c60e1bc4a9c3 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" diff --git a/po/th.po b/po/th.po -index 91c78cc07fce..1f1fa486f941 100644 +index 63263749655c..cfe13fc93211 100644 --- a/po/th.po +++ b/po/th.po -@@ -2676,8 +2676,8 @@ msgstr "ปิ_ดหน้าต่าง" +@@ -2803,8 +2803,8 @@ msgstr "ปิ_ดหน้าต่าง" #~ msgid "_Solid color" #~ msgstr "สี_ทึบ" @@ -2039,10 +2038,10 @@ index 0a04bc62af1b..c097f0c1d328 100644 #~ msgid "Switch to Tab 2" #~ msgstr "До вкладки 2" diff --git a/po/vi.po b/po/vi.po -index 4cf9a8fe22e2..15fcff29b3da 100644 +index 01db48d95bf2..4fd74197deb8 100644 --- a/po/vi.po +++ b/po/vi.po -@@ -2863,3 +2863,6 @@ msgstr "Đón_g cửa sổ" +@@ -2867,3 +2867,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." diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 90d3659..0d698c6 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -2,13 +2,13 @@ %define glib2_version 2.42.0 %define gtk3_version 3.12.0 -%define vte_version 0.45.90 +%define vte_version 0.45.92 %define desktop_file_utils_version 0.2.90 Summary: Terminal emulator for GNOME Name: gnome-terminal -Version: 3.21.90 -Release: 2%{?dist} +Version: 3.21.92 +Release: 1%{?dist} License: GPLv3+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ @@ -18,9 +18,6 @@ Source1: org.gnome.Terminal.gschema.override Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch -# Backported from upstream -Patch1: 0001-Revert-window-Fix-CSD-size-calculations-with-long-ti.patch - Patch100: gnome-terminal-transparency-notify.patch BuildRequires: dbus-x11 @@ -67,7 +64,6 @@ option to the right-click context menu in Nautilus. %prep %setup -q %patch0 -p1 -b .warnings -%patch1 -p1 %patch100 -p1 -b .dark-transparency-notify %build @@ -115,6 +111,10 @@ fi %{_datadir}/appdata/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Wed Sep 14 2016 Kalev Lember - 3.21.92-1 +- Update to 3.21.92 +- Rebase the translations + * Fri Aug 19 2016 Kalev Lember - 3.21.90-2 - Backport a patch to fix terminal shrinking with every line entered diff --git a/sources b/sources index 3c6d6c7..57099fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -868629ca954ba7ef1759e54e67ac2484 gnome-terminal-3.21.90.tar.xz +5c00111ba37371eb60b51cd0cdc15bfe gnome-terminal-3.21.92.tar.xz