From 7ff1f23eda7bc64d000437bc38f68f80ca0dda00 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 19:28:29 +0000 Subject: import gnome-terminal-3.28.3-1.el8 --- diff --git a/.gitignore b/.gitignore index 5b7fa8f..a33058d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-terminal-3.28.2.tar.xz +SOURCES/gnome-terminal-3.28.3.tar.xz diff --git a/.gnome-terminal.metadata b/.gnome-terminal.metadata index 8bef44a..635f037 100644 --- a/.gnome-terminal.metadata +++ b/.gnome-terminal.metadata @@ -1 +1 @@ -b0adaef543572a50ac339924158e32d1e1ce44f3 SOURCES/gnome-terminal-3.28.2.tar.xz +7dd85f03637587487b3fede30160edcecc97580b SOURCES/gnome-terminal-3.28.3.tar.xz diff --git a/SOURCES/0001-client-legacy-Fix-invalid-free.patch b/SOURCES/0001-client-legacy-Fix-invalid-free.patch deleted file mode 100644 index 4d52a7c..0000000 --- a/SOURCES/0001-client-legacy-Fix-invalid-free.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2f7053f5fa9154437b9397cd204a38e2686107bc Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Tue, 29 May 2018 10:47:22 +0200 -Subject: [PATCH] client: legacy: Fix invalid free - -Use g_free() for memory allocated with g_new(). - -https://gitlab.gnome.org/GNOME/gnome-terminal/issues/1 ---- - src/terminal-options.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/terminal-options.c b/src/terminal-options.c -index d1e8a4a4ca48..83ead8909a52 100644 ---- a/src/terminal-options.c -+++ b/src/terminal-options.c -@@ -1277,7 +1277,7 @@ terminal_options_free (TerminalOptions *options) - - g_clear_object (&options->profiles_list); - -- g_slice_free (TerminalOptions, options); -+ g_free (options); - } - - static GOptionContext * --- -2.14.3 - diff --git a/SOURCES/gnome-terminal-notify-open-title-transparency.patch b/SOURCES/gnome-terminal-notify-open-title-transparency.patch index a1098f1..1d579f2 100644 --- a/SOURCES/gnome-terminal-notify-open-title-transparency.patch +++ b/SOURCES/gnome-terminal-notify-open-title-transparency.patch @@ -1,4 +1,4 @@ -From 8280180dd48841ea04c9eb437c2d015423673763 Mon Sep 17 00:00:00 2001 +From ac2ed7d3f0f18253c719aff2f4224c4aab7117b5 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 01/16] Restore transparency @@ -16,12 +16,12 @@ restore the translations of the string. Some changes by Peter Weber --- - src/org.gnome.Terminal.gschema.xml | 10 ++++++++ - src/preferences.ui | 47 ++++++++++++++++++++++++++++++++++++++ - src/profile-editor.c | 16 +++++++++++++ - src/terminal-schemas.h | 3 +++ - src/terminal-screen.c | 22 +++++++++++++++++- - src/terminal-window.c | 7 ++++++ + src/org.gnome.Terminal.gschema.xml | 10 +++++++ + src/preferences.ui | 47 ++++++++++++++++++++++++++++++ + src/profile-editor.c | 16 ++++++++++ + src/terminal-schemas.h | 3 ++ + src/terminal-screen.c | 22 +++++++++++++- + src/terminal-window.c | 7 +++++ 6 files changed, 104 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml @@ -152,10 +152,10 @@ index 46ed321df074..8e79bb2e49f5 100644 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index f67f8a2fd995..1d99ba0cb289 100644 +index e8c1b304d31d..13055a1b47b4 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -832,7 +832,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -831,7 +831,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || @@ -166,7 +166,7 @@ index f67f8a2fd995..1d99ba0cb289 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -909,6 +911,8 @@ update_color_scheme (TerminalScreen *screen) +@@ -908,6 +910,8 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; GtkStyleContext *context; @@ -175,7 +175,7 @@ index f67f8a2fd995..1d99ba0cb289 100644 gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -950,6 +954,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -949,6 +953,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -194,7 +194,7 @@ index f67f8a2fd995..1d99ba0cb289 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -957,6 +973,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -956,6 +972,10 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -206,10 +206,10 @@ index f67f8a2fd995..1d99ba0cb289 100644 static void diff --git a/src/terminal-window.c b/src/terminal-window.c -index a348a8032c18..b665d3101b10 100644 +index d2ae3ea6d68b..ca689641ac11 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2100,6 +2100,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2112,6 +2112,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -218,7 +218,7 @@ index a348a8032c18..b665d3101b10 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2114,6 +2116,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2126,6 +2128,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -231,10 +231,10 @@ index a348a8032c18..b665d3101b10 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.14.3 +2.23.0 -From 44fd3a09d263851285a0e72f73f213dc50d0d797 Mon Sep 17 00:00:00 2001 +From bd14154dea19f35b087f3a2dc65b7f5160753273 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 02/16] window: Make the drawing robust across all themes @@ -254,10 +254,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 b665d3101b10..3835c617b660 100644 +index ca689641ac11..a5cd46d3a236 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1956,6 +1956,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -1968,6 +1968,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } @@ -284,7 +284,7 @@ index b665d3101b10..3835c617b660 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2267,6 +2287,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2279,6 +2299,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -293,10 +293,10 @@ index b665d3101b10..3835c617b660 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.14.3 +2.23.0 -From 6603429319268785b3314a5e301a88f6571687f9 Mon Sep 17 00:00:00 2001 +From bd78c56a61856691296f83f5b0e62a5410d6c680 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 03/16] screen, window: Extra padding around transparent @@ -309,7 +309,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 1d99ba0cb289..e074bbf35405 100644 +index 13055a1b47b4..f4334521847d 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -141,6 +141,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, @@ -329,7 +329,7 @@ index 1d99ba0cb289..e074bbf35405 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -896,6 +899,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -895,6 +898,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -362,7 +362,7 @@ index 1d99ba0cb289..e074bbf35405 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -974,9 +1003,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -973,9 +1002,7 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -373,7 +373,7 @@ index 1d99ba0cb289..e074bbf35405 100644 } static void -@@ -1581,6 +1608,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1580,6 +1607,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -388,10 +388,10 @@ index 1d99ba0cb289..e074bbf35405 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 3835c617b660..662475af107e 100644 +index a5cd46d3a236..3c0795692fb8 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1962,15 +1962,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -1974,15 +1974,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -420,10 +420,10 @@ index 3835c617b660..662475af107e 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.14.3 +2.23.0 -From 7f61a674fb8afc3f1546442610165d131819b9e6 Mon Sep 17 00:00:00 2001 +From 1b13583705869b477f61ddaa4951ba00a06e34cc Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 27 Feb 2017 16:53:51 +0100 Subject: [PATCH 04/16] screen: Silence -Wunused variable @@ -434,10 +434,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943 1 file changed, 1 deletion(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index e074bbf35405..1894bc0c366d 100644 +index f4334521847d..8435f3e09d80 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -940,7 +940,6 @@ update_color_scheme (TerminalScreen *screen) +@@ -939,7 +939,6 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; GtkStyleContext *context; @@ -446,24 +446,24 @@ index e074bbf35405..1894bc0c366d 100644 gboolean use_theme_colors; -- -2.14.3 +2.23.0 -From 793a0c45f37cbfa55a09b71369ee36f4ddb33f80 Mon Sep 17 00:00:00 2001 +From 5e1098b0c3eee8d179aa6581e6401c9c3b56b815 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 27 Jan 2015 18:40:13 +0100 Subject: [PATCH 05/16] Support desktop notifications from OSC 777 https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-app.c | 32 ++++++++++++++ - src/terminal-screen.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ - src/terminal-tab-label.c | 28 +++++++++++- + src/terminal-app.c | 32 ++++++++++++ + src/terminal-screen.c | 108 +++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.c | 28 +++++++++- src/terminal-tab-label.h | 4 ++ 4 files changed, 171 insertions(+), 1 deletion(-) diff --git a/src/terminal-app.c b/src/terminal-app.c -index 6a7ba4731df7..2f087f8fa333 100644 +index d76dc2b4fd55..2f13acca9042 100644 --- a/src/terminal-app.c +++ b/src/terminal-app.c @@ -651,6 +651,31 @@ app_menu_quit_cb (GSimpleAction *action, @@ -520,7 +520,7 @@ index 6a7ba4731df7..2f087f8fa333 100644 app_load_css (application); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 1894bc0c366d..fa967c5e1593 100644 +index 8435f3e09d80..5c525fd0dc5f 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -55,6 +55,7 @@ @@ -583,7 +583,7 @@ index 1894bc0c366d..fa967c5e1593 100644 settings = gtk_widget_get_settings (GTK_WIDGET (screen)); g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA, -@@ -1696,6 +1709,43 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1695,6 +1708,43 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -627,7 +627,7 @@ index 1894bc0c366d..fa967c5e1593 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1796,6 +1846,64 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1795,6 +1845,64 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -768,10 +768,10 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.14.3 +2.23.0 -From 870a2ff157140309dbf5ba777f5f7c3625fb9dab Mon Sep 17 00:00:00 2001 +From 77c1c03b39efa556d48175d0b5e0c5fbf6e2e865 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 11:47:21 +0100 Subject: [PATCH 06/16] Sprinkle debug messages for notifications @@ -813,10 +813,10 @@ index 0fafcc3a846c..af1358683994 100644 void _terminal_debug_init(void); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index fa967c5e1593..41d30b0350a4 100644 +index 5c525fd0dc5f..22f5f7bb04a2 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1717,6 +1717,8 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1716,6 +1716,8 @@ terminal_screen_focus_in (GtkWidget *widget, TerminalApp *app; TerminalWindow *window; @@ -825,7 +825,7 @@ index fa967c5e1593..41d30b0350a4 100644 window = terminal_screen_get_window (screen); if (window != NULL) { -@@ -1855,6 +1857,8 @@ terminal_screen_notification_received (VteTerminal *terminal, +@@ -1854,6 +1856,8 @@ terminal_screen_notification_received (VteTerminal *terminal, TerminalScreenPrivate *priv = screen->priv; TerminalWindow *window; @@ -834,7 +834,7 @@ index fa967c5e1593..41d30b0350a4 100644 if (G_UNLIKELY (!priv->shell_prompt_shown)) { priv->shell_prompt_shown = TRUE; -@@ -1886,6 +1890,7 @@ terminal_screen_notification_received (VteTerminal *terminal, +@@ -1885,6 +1889,7 @@ terminal_screen_notification_received (VteTerminal *terminal, tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); @@ -842,7 +842,7 @@ index fa967c5e1593..41d30b0350a4 100644 } } else -@@ -1901,6 +1906,7 @@ terminal_screen_notification_received (VteTerminal *terminal, +@@ -1900,6 +1905,7 @@ terminal_screen_notification_received (VteTerminal *terminal, app = terminal_app_get (); g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); @@ -851,10 +851,10 @@ index fa967c5e1593..41d30b0350a4 100644 } -- -2.14.3 +2.23.0 -From cbccd30b5e871b4f012af78b70ca0b141506101c Mon Sep 17 00:00:00 2001 +From ce8074db5703c61a69c486c4895889269bd2b4ff Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 28 Mar 2018 18:50:16 +0200 Subject: [PATCH 07/16] Restore separate menuitems for opening tabs and windows @@ -875,7 +875,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1300826 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am -index 815333154958..3645c5548d25 100644 +index 37d8b36474fd..c94a7b6cb732 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,6 +94,7 @@ gnome_terminal_server_SOURCES = \ @@ -887,10 +887,10 @@ index 815333154958..3645c5548d25 100644 -DTERM_LOCALEDIR="\"$(datadir)/locale\"" \ -DTERM_LIBEXECDIR="\"$(libexecdir)\"" \ -- -2.14.3 +2.23.0 -From f85b35457d680b2c7d50470a69f461d9bbe33425 Mon Sep 17 00:00:00 2001 +From aa2b4975efff398b682aced579f94d4b2013c1e9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 Subject: [PATCH 08/16] profile: Split the Command tab into two nested GtkGrids @@ -900,7 +900,7 @@ the command settings separate from the to-be-restored title settings. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/preferences.ui | 173 ++++++++++++++++++++++++++++------------------------- + src/preferences.ui | 173 +++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 83 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui @@ -1094,10 +1094,10 @@ index f5c366f14e10..edd924689d35 100644 -- -2.14.3 +2.23.0 -From b1c245c19e2c28f1a3a91f212047acfe9e0f6ff7 Mon Sep 17 00:00:00 2001 +From f0339409266d76438b47cf802861e95ab3bf220a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 Subject: [PATCH 09/16] Revert "profile: Remove the "Command" sub-heading" @@ -1106,7 +1106,7 @@ This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/preferences.ui | 179 ++++++++++++++++++++++++++++++++--------------------- + src/preferences.ui | 179 +++++++++++++++++++++++++++------------------ 1 file changed, 109 insertions(+), 70 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui @@ -1318,10 +1318,10 @@ index edd924689d35..11a283064996 100644 -- -2.14.3 +2.23.0 -From 04de9c589603437e09d19079d621295a954dc5c8 Mon Sep 17 00:00:00 2001 +From b6789831af03ac42c73d1ffae22d511dab400f38 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 Subject: [PATCH 10/16] Revert "screen: Remove unused description and @@ -1331,12 +1331,12 @@ This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/terminal-screen.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/terminal-screen.c | 63 +++++++++++++++++++++++++++++++++++++++++++ src/terminal-screen.h | 6 +++++ 2 files changed, 69 insertions(+) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 41d30b0350a4..4b972922c783 100644 +index 22f5f7bb04a2..9175a5170034 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -88,6 +88,7 @@ struct _TerminalScreenPrivate @@ -1395,7 +1395,7 @@ index 41d30b0350a4..4b972922c783 100644 g_free (priv->initial_working_directory); g_strfreev (priv->override_command); g_strfreev (priv->initial_env); -@@ -790,6 +804,21 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen) +@@ -789,6 +803,21 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen) return vte_terminal_get_icon_title (VTE_TERMINAL (screen)) != NULL; } @@ -1417,7 +1417,7 @@ index 41d30b0350a4..4b972922c783 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1107,6 +1136,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1106,6 +1135,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1425,7 +1425,7 @@ index 41d30b0350a4..4b972922c783 100644 } GSettings* -@@ -1437,6 +1467,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1436,6 +1466,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1434,7 +1434,7 @@ index 41d30b0350a4..4b972922c783 100644 if (error) { GtkWidget *info_bar; -@@ -1748,6 +1780,35 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1747,6 +1779,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1470,7 +1470,7 @@ index 41d30b0350a4..4b972922c783 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1805,6 +1866,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1804,6 +1865,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -1500,10 +1500,10 @@ index 743071d5e38f..63f9c47e115a 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.14.3 +2.23.0 -From 946b733a351cb2010452ae04110010968e494e18 Mon Sep 17 00:00:00 2001 +From c22cb0b2e16c4f0fe984c0ec67049a70fe232e0f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 Subject: [PATCH 11/16] Revert "Remove the static title setting from profile @@ -1515,10 +1515,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/migration.c | 3 ++ src/org.gnome.Terminal.gschema.xml | 5 +++ - src/preferences.ui | 71 ++++++++++++++++++++++++++++++++++++++ + src/preferences.ui | 71 ++++++++++++++++++++++++++++++ src/profile-editor.c | 5 +++ src/terminal-schemas.h | 1 + - src/terminal-screen.c | 9 +++++ + src/terminal-screen.c | 9 ++++ 6 files changed, 94 insertions(+) diff --git a/src/migration.c b/src/migration.c @@ -1669,10 +1669,10 @@ index 8e79bb2e49f5..b9c6990e356c 100644 #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 4b972922c783..0e4c23fa8e8c 100644 +index 9175a5170034..10b3debcc384 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -808,11 +808,14 @@ char * +@@ -807,11 +807,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; @@ -1687,7 +1687,7 @@ index 4b972922c783..0e4c23fa8e8c 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -857,6 +860,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -856,6 +859,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); } @@ -1701,10 +1701,10 @@ index 4b972922c783..0e4c23fa8e8c 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.14.3 +2.23.0 -From b58560467b9022905b56d58b3ff60cf3154a7a81 Mon Sep 17 00:00:00 2001 +From cb7059bb53a7fa7759d6b517358945308e2321a3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 12/16] Restore translations for setting a title and @@ -2312,10 +2312,10 @@ index d97e6102b850..a768fe4adc54 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index d4d2e487df32..eebd8e602b17 100644 +index 539a9469553c..eb06f1452cae 100644 --- a/po/el.po +++ b/po/el.po -@@ -2484,17 +2484,17 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2804,17 +2804,17 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "Default size:" #~ msgstr "Προεπιλεγμένο μέγεθος:" @@ -2339,7 +2339,7 @@ index d4d2e487df32..eebd8e602b17 100644 #~ msgid "Current Locale" #~ msgstr "Τρέχουσα τοπική ρύθμιση" -@@ -2559,3 +2559,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2852,3 +2852,6 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -3709,7 +3709,7 @@ index c40dba26b08a..9be7eec414e9 100644 +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index acd25ab33eca..5bd7303eb50c 100644 +index 53dd72be9c45..d694adf36934 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3412,8 +3412,8 @@ msgstr "Î_nchide fereastra" @@ -3815,10 +3815,10 @@ index d0282159b459..01dd96a06939 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index 2302966b5585..ea8d20160cd0 100644 +index 77747b90421b..eb50ec10473e 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2428,17 +2428,17 @@ msgstr "_Zapri okno" +@@ -2668,17 +2668,17 @@ msgstr "_Zapri okno" #~ msgid "Default size:" #~ msgstr "Privzeta velikost:" @@ -3842,7 +3842,7 @@ index 2302966b5585..ea8d20160cd0 100644 #~ msgid "Current Locale" #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2589,3 +2589,6 @@ msgstr "_Zapri okno" +@@ -2793,3 +2793,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -4419,10 +4419,10 @@ index 44a8e21c7842..12aa6d190d99 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/zh_CN.po b/po/zh_CN.po -index b64071ce4bae..3f4aefe744fd 100644 +index 6c80dcd1231a..51e5f9999176 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2356,17 +2356,17 @@ msgstr "关闭窗口(_L)" +@@ -2580,17 +2580,17 @@ msgstr "关闭窗口(_L)" #~ msgid "Default size:" #~ msgstr "默认大小：" @@ -4446,7 +4446,7 @@ index b64071ce4bae..3f4aefe744fd 100644 #~ msgid "Current Locale" #~ msgstr "当前区域" -@@ -2512,3 +2512,6 @@ msgstr "关闭窗口(_L)" +@@ -2703,3 +2703,6 @@ msgstr "关闭窗口(_L)" #~ msgid "_Find..." #~ msgstr "查找(_F)..." @@ -4524,10 +4524,10 @@ index 169c0bd009f9..2a3448af26ef 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.14.3 +2.23.0 -From 09085f916e0984d7e4cf7d3da0e8ed5a799f963d Mon Sep 17 00:00:00 2001 +From da8724530da31bc09f0936ceac6f98b65590a103 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 6 Apr 2018 14:40:29 +0200 Subject: [PATCH 13/16] notebook-menu: Add placeholder item for win.set-title @@ -4556,10 +4556,10 @@ index 8854a7b35e44..d5c7f41e7561 100644
-- -2.14.3 +2.23.0 -From fc1fd71fc9e06e4d1b68ff76803d622b1275c5da Mon Sep 17 00:00:00 2001 +From 2283727d069ca5511d0ca61a9c3b6f0ea6513dc1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 Subject: [PATCH 14/16] Restore the action and shortcut to set a static title @@ -4573,7 +4573,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 src/migration.c | 1 + src/org.gnome.Terminal.gschema.xml | 4 ++ src/terminal-accels.c | 2 + - src/terminal-window.c | 75 ++++++++++++++++++++++++++++++++++++++ + src/terminal-window.c | 75 ++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) diff --git a/src/migration.c b/src/migration.c @@ -4604,7 +4604,7 @@ index ff54ebb2544f..147d36017c1f 100644 'disabled' Keyboard shortcut to reset the terminal diff --git a/src/terminal-accels.c b/src/terminal-accels.c -index bbe3268bc9a4..3162108071bf 100644 +index 6c7965a6b48b..2ce4635d09cd 100644 --- a/src/terminal-accels.c +++ b/src/terminal-accels.c @@ -75,6 +75,7 @@ @@ -4624,7 +4624,7 @@ index bbe3268bc9a4..3162108071bf 100644 static KeyEntry tabs_entries[] = { diff --git a/src/terminal-window.c b/src/terminal-window.c -index 662475af107e..05a812544bb2 100644 +index 3c0795692fb8..4f836b16fd2c 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -747,6 +747,80 @@ action_select_all_cb (GSimpleAction *action, @@ -4708,7 +4708,7 @@ index 662475af107e..05a812544bb2 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2092,6 +2166,7 @@ terminal_window_init (TerminalWindow *window) +@@ -2104,6 +2178,7 @@ terminal_window_init (TerminalWindow *window) { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL }, { "reset", action_reset_cb, "b", NULL, NULL }, { "select-all", action_select_all_cb, NULL, NULL, NULL }, @@ -4717,10 +4717,10 @@ index 662475af107e..05a812544bb2 100644 { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, -- -2.14.3 +2.23.0 -From 97bb6a9bacb3496f669bb0f876c629015f1fc211 Mon Sep 17 00:00:00 2001 +From 9c7fc392ef9842aeedb1bf2cdeceec6307f2d359 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 Subject: [PATCH 15/16] screen: Style fix @@ -4734,10 +4734,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 0e4c23fa8e8c..cdf1a2baecfc 100644 +index 10b3debcc384..e1325cbee6ba 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -713,7 +713,7 @@ terminal_screen_new (GSettings *profile, +@@ -712,7 +712,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ @@ -4747,10 +4747,10 @@ index 0e4c23fa8e8c..cdf1a2baecfc 100644 const char *p; -- -2.14.3 +2.23.0 -From 674fbfae9c998e242b344aa16c50388419a0078f Mon Sep 17 00:00:00 2001 +From a1befc1c927c4569c203f9416cc9d6ed80a5c1ac Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 Subject: [PATCH 16/16] Restore the rest of the title handling options and make @@ -4763,11 +4763,11 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/migration.c | 4 + src/org.gnome.Terminal.gschema.xml | 12 ++ - src/preferences.ui | 33 +++- + src/preferences.ui | 33 ++- src/profile-editor.c | 9 + src/terminal-enums.h | 8 + src/terminal-schemas.h | 1 + - src/terminal-screen.c | 328 ++++++++++++++++++++++++++++--------- + src/terminal-screen.c | 328 ++++++++++++++++++++++------- src/terminal-screen.h | 8 +- src/terminal-window.c | 11 +- 9 files changed, 334 insertions(+), 80 deletions(-) @@ -4927,7 +4927,7 @@ index b9c6990e356c..240213fead43 100644 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index cdf1a2baecfc..faf906c763e7 100644 +index e1325cbee6ba..a03ae6bdae12 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -88,13 +88,17 @@ struct _TerminalScreenPrivate @@ -5027,7 +5027,7 @@ index cdf1a2baecfc..faf906c763e7 100644 g_free (priv->initial_working_directory); g_strfreev (priv->override_command); g_strfreev (priv->initial_env); -@@ -710,28 +715,8 @@ terminal_screen_new (GSettings *profile, +@@ -709,28 +714,8 @@ terminal_screen_new (GSettings *profile, g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS_KEY), g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY)); @@ -5058,7 +5058,7 @@ index cdf1a2baecfc..faf906c763e7 100644 priv->initial_working_directory = g_strdup (working_dir); -@@ -786,46 +771,175 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -785,46 +770,175 @@ terminal_screen_exec (TerminalScreen *screen, return terminal_screen_do_exec (screen, data, error); } @@ -5248,7 +5248,7 @@ index cdf1a2baecfc..faf906c763e7 100644 { TerminalScreenPrivate *priv = screen->priv; GObject *object = G_OBJECT (screen); -@@ -861,9 +975,11 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -860,9 +974,11 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5261,7 +5261,7 @@ index cdf1a2baecfc..faf906c763e7 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1145,7 +1261,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1144,7 +1260,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5269,7 +5269,7 @@ index cdf1a2baecfc..faf906c763e7 100644 } GSettings* -@@ -1476,8 +1591,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1475,8 +1590,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5278,7 +5278,7 @@ index cdf1a2baecfc..faf906c763e7 100644 if (error) { GtkWidget *info_bar; -@@ -1789,33 +1902,83 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1788,33 +1901,83 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5376,7 +5376,7 @@ index cdf1a2baecfc..faf906c763e7 100644 } /** -@@ -1848,15 +2011,18 @@ static void +@@ -1847,15 +2010,18 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5398,7 +5398,7 @@ index cdf1a2baecfc..faf906c763e7 100644 } static void -@@ -1875,8 +2041,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1874,8 +2040,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -5407,7 +5407,7 @@ index cdf1a2baecfc..faf906c763e7 100644 action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); switch (action) -@@ -1920,6 +2084,24 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1919,6 +2083,24 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5459,7 +5459,7 @@ index 63f9c47e115a..51472685f402 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); diff --git a/src/terminal-window.c b/src/terminal-window.c -index 05a812544bb2..adf13e60472d 100644 +index 4f836b16fd2c..c238c4099ebc 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -765,6 +765,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, @@ -5475,7 +5475,7 @@ index 05a812544bb2..adf13e60472d 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2521,14 +2527,11 @@ sync_screen_title (TerminalScreen *screen, +@@ -2533,14 +2539,11 @@ sync_screen_title (TerminalScreen *screen, TerminalWindow *window) { TerminalWindowPrivate *priv = window->priv; @@ -5492,5 +5492,5 @@ index 05a812544bb2..adf13e60472d 100644 static void -- -2.14.3 +2.23.0 diff --git a/SPECS/gnome-terminal.spec b/SPECS/gnome-terminal.spec index fed7725..bef3e2e 100644 --- a/SPECS/gnome-terminal.spec +++ b/SPECS/gnome-terminal.spec @@ -6,8 +6,8 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.28.2 -Release: 3%{?dist} +Version: 3.28.3 +Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ @@ -15,8 +15,6 @@ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/gnome-terminal/3.28/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override -Patch0: 0001-client-legacy-Fix-invalid-free.patch - Patch100: gnome-terminal-notify-open-title-transparency.patch Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch @@ -61,7 +59,6 @@ option to the right-click context menu in Nautilus. %prep %setup -q -%patch0 -p1 -b .client-free %patch100 -p1 -b .notify-open-title-transparency %patch101 -p1 -b .warnings @@ -103,6 +100,10 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Wed Dec 11 2019 Debarshi Ray - 3.28.3-1 +- Update to 3.28.3 +- Resolves: #1642427 + * Mon Jul 30 2018 Florian Weimer - 3.28.2-3 - Rebuild with fixed binutils