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

Update to 3.46.8

Browse Source
This commit is contained in:
David King 2023-02-16 14:09:31 +00:00
parent 543c2d91c1
commit 07fad51112
6 changed files with 97 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -117,3 +117,4 @@ gnome-terminal-2.31.3.tar.bz2
/gnome-terminal-3.44.0.tar.xz /gnome-terminal-3.44.0.tar.xz
/gnome-terminal-3.44.1.tar.xz /gnome-terminal-3.44.1.tar.xz
/gnome-terminal-3.46.7.tar.bz2 /gnome-terminal-3.46.7.tar.bz2
/gnome-terminal-3.46.8.tar.bz2

190
gnome-terminal-3.45.90-nautilus-extension.patch
View File

@ -1,190 +0,0 @@
From 699ad74e98cf0d757798fdc0eeed53dd13207ea3 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Wed, 10 Aug 2022 18:12:39 +0200
Subject: [PATCH 1/4] build: Update nautilus extension build req
With the nautilus gtk4 port, the pkg-config name has changed.
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 7a892ed1..eeb14c4b 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,7 @@ gtk_min_req_version = '3.18'
gtk_max_allowed_version = '3.24'
dconf_req_version = '0.14.0'
-libnautilus_ext_req_version = '3.28.0'
+libnautilus_ext_req_version = '43'
pcre2_req_version = '10.00'
schemas_req_version = '0.1.0'
@@ -333,7 +333,7 @@ schemas_dep = dependency('gsettings-desktop-schemas',
uuid_dep = dependency('uuid')
if get_option('nautilus_extension')
- libnautilus_extension_dep = dependency('libnautilus-extension', version: '>=' + libnautilus_ext_req_version,)
+ libnautilus_extension_dep = dependency('libnautilus-extension-4', version: '>=' + libnautilus_ext_req_version,)
else
libnautilus_extension_dep = dependency('', required: false,)
endif
--
2.37.2
From f0b0354f59def21c4cf077dd6b87ba711b21e4a5 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Wed, 10 Aug 2022 18:37:26 +0200
Subject: [PATCH 2/4] build: Fix nautilus extension install directory
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index eeb14c4b..0b5e8282 100644
--- a/meson.build
+++ b/meson.build
@@ -85,7 +85,7 @@ gt_schemadir = gt_datadir / 'glib-2.0' / 'schemas'
gt_searchproviderdir = gt_datadir / 'gnome-shell' / 'search-providers'
-gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-3.0'
+gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-4'
gt_dbusinterfacedir = gt_datadir / 'dbus-1' / 'interfaces'
gt_dbusservicedir = gt_datadir / 'dbus-1' / 'services'
--
2.37.2
From 388d8d2c1ed87c6dcf60e22c2da1482b9cbafd5d Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Mon, 15 Aug 2022 20:56:17 +0200
Subject: [PATCH 3/4] nautilus: Don't include gdk headers in the nautilus
extension
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
---
src/meson.build | 1 +
src/terminal-client-utils.cc | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/src/meson.build b/src/meson.build
index 99f47f82..97271278 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -358,6 +358,7 @@ if get_option('nautilus_extension')
]
nautilus_cxxflags = glib_version_cxxflags + [
+ '-DTERMINAL_NAUTILUS',
'-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir),
]
diff --git a/src/terminal-client-utils.cc b/src/terminal-client-utils.cc
index acd1719f..9158d65c 100644
--- a/src/terminal-client-utils.cc
+++ b/src/terminal-client-utils.cc
@@ -29,10 +29,12 @@
#include <gio/gio.h>
+#ifndef TERMINAL_NAUTILUS
#include <gdk/gdk.h>
#if defined(TERMINAL_COMPILATION) && defined(GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#endif
+#endif
/**
* terminal_client_append_create_instance_options:
@@ -268,6 +270,8 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
}
}
+#ifndef TERMINAL_NAUTILUS
+
/**
* terminal_client_get_fallback_startup_id:
*
@@ -333,6 +337,8 @@ out:
return nullptr;
}
+#endif /* !TERMINAL_NAUTILUS */
+
GSettings*
terminal_g_settings_new_with_path (GSettingsSchemaSource* source,
char const* schema_id,
--
2.37.2
From 7946c7fc0f0ea24c9501667e965a355c388a2da9 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Tue, 16 Aug 2022 23:19:34 +0200
Subject: [PATCH 4/4] nautilus: Try to fix the build with nautilus 43
Remove all use of gtk/gdk from the nautilus extension.
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
---
src/terminal-nautilus.cc | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/terminal-nautilus.cc b/src/terminal-nautilus.cc
index 4b4bbd8d..9a3ea78a 100644
--- a/src/terminal-nautilus.cc
+++ b/src/terminal-nautilus.cc
@@ -22,7 +22,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
-#include <gtk/gtk.h>
/* Work around https://gitlab.gnome.org/GNOME/nautilus/-/issues/1884 */
extern "C" {
@@ -325,7 +324,7 @@ create_terminal (ExecData *data /* transfer full */)
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
terminal_client_append_create_instance_options (&builder,
- gdk_display_get_name (gdk_display_get_default ()),
+ nullptr, // display name. FIXMEgtk4?
startup_id,
nullptr /* geometry */,
nullptr /* role */,
@@ -461,11 +460,7 @@ terminal_nautilus_menu_item_activate (NautilusMenuItem *item)
data = g_new (ExecData, 1);
data->nautilus = (TerminalNautilus*)g_object_ref (nautilus);
-#if GTK_CHECK_VERSION (4, 0, 0)
- data->timestamp = GDK_CURRENT_TIME; /* FIXMEgtk4 */
-#else
- data->timestamp = gtk_get_current_event_time ();
-#endif
+ data->timestamp = 0; // GDK_CURRENT_TIME
data->path = path;
data->uri = uri;
data->info = info;
@@ -587,7 +582,6 @@ terminal_nautilus_menu_item_new (TerminalNautilus *nautilus,
static GList *
terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
- GtkWidget *window,
NautilusFileInfo *file_info)
{
TerminalNautilus *nautilus = TERMINAL_NAUTILUS (provider);
@@ -636,7 +630,6 @@ terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
static GList *
terminal_nautilus_get_file_items (NautilusMenuProvider *provider,
- GtkWidget *window,
GList *files)
{
TerminalNautilus *nautilus = TERMINAL_NAUTILUS (provider);
--
2.37.2

51
gnome-terminal-3.45.90-xml-namespaces.patch
View File

@ -1,51 +0,0 @@
From d766e4f63a34ef1cbd29e7d20c5ceb814361fb23 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Mon, 13 Sep 2021 00:17:00 +0200
Subject: [PATCH] metainfo: Remove XML namespaces
They breaks merging translations due to gettext bug
https://savannah.gnu.org/bugs/?54472 .
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/356
---
data/org.gnome.Terminal.Nautilus.metainfo.xml.in | 6 +-----
data/org.gnome.Terminal.metainfo.xml.in | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/data/org.gnome.Terminal.Nautilus.metainfo.xml.in b/data/org.gnome.Terminal.Nautilus.metainfo.xml.in
index bce73491..a28b79f8 100644
--- a/data/org.gnome.Terminal.Nautilus.metainfo.xml.in
+++ b/data/org.gnome.Terminal.Nautilus.metainfo.xml.in
@@ -27,11 +27,7 @@
of the GNU Free Documentation License along with this program.
If not, see <https://www.gnu.org/licenses/>.
-->
-<component
- xmlns="https://specifications.freedesktop.org/metainfo/1.0"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:its="http://www.w3.org/2005/11/its"
- type="addon">
+<component type="addon">
<id>org.gnome.Terminal.Nautilus</id>
<extends>org.gnome.Nautilus.desktop</extends>
<metadata_license>GPL-3.0+ or GFDL-1.3-only</metadata_license>
diff --git a/data/org.gnome.Terminal.metainfo.xml.in b/data/org.gnome.Terminal.metainfo.xml.in
index 6a4e7de5..da5e7d2b 100644
--- a/data/org.gnome.Terminal.metainfo.xml.in
+++ b/data/org.gnome.Terminal.metainfo.xml.in
@@ -27,11 +27,7 @@
of the GNU Free Documentation License along with this program.
If not, see <https://www.gnu.org/licenses/>.
-->
-<component
- xmlns="https://specifications.freedesktop.org/metainfo/1.0"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:its="http://www.w3.org/2005/11/its"
- type="desktop-application">
+<component type="desktop-application">
<id>org.gnome.Terminal.desktop</id>
<metadata_license>GPL-3.0+ or GFDL-1.3-only</metadata_license>
<project_license>GPL-3.0+</project_license>
--
2.37.2

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

@ -1,4 +1,4 @@
From b258ef0bdc4f1ea8dc9d8bf0b47a14d0b17d4473 Mon Sep 17 00:00:00 2001 From 73ca5997137f14a01be8a3a369101b8b3d93ca3e Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 12 May 2014 14:57:18 +0200 Date: Mon, 12 May 2014 14:57:18 +0200
Subject: [PATCH 01/16] Restore transparency Subject: [PATCH 01/16] Restore transparency
@ -155,7 +155,7 @@ index 61f1305e..c33723bf 100644
#define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info"
#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 54e10223..bae9c0cf 100644 index a559f7f9..16f98c9d 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -1059,7 +1059,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, @@ -1059,7 +1059,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@ -237,7 +237,7 @@ index 36eb7ce7..a41d2de2 100644
2.39.1 2.39.1
From 0ab778ac032b1b5bc938dc73b11c2b58271b8567 Mon Sep 17 00:00:00 2001 From 8892f7cf3fc715457bd822f27393b156ef82e3d0 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com> From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 28 May 2014 14:11:02 +0200 Date: Wed, 28 May 2014 14:11:02 +0200
Subject: [PATCH 02/16] window: Make the drawing robust across all themes Subject: [PATCH 02/16] window: Make the drawing robust across all themes
@ -299,7 +299,7 @@ index a41d2de2..11d93419 100644
2.39.1 2.39.1
From 893b1b1ffba63bcaa78a29a127b5787325abc8cb Mon Sep 17 00:00:00 2001 From d0bdf90b9523b9484ab5425494635323b535ee40 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net> From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Fri, 13 Nov 2015 15:16:42 +0100 Date: Fri, 13 Nov 2015 15:16:42 +0100
Subject: [PATCH 03/16] screen, window: Extra padding around transparent Subject: [PATCH 03/16] screen, window: Extra padding around transparent
@ -312,7 +312,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
2 files changed, 49 insertions(+), 10 deletions(-) 2 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index bae9c0cf..85f0fbcf 100644 index 16f98c9d..51fdc20b 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -156,6 +156,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, @@ -156,6 +156,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@ -384,7 +384,7 @@ index bae9c0cf..85f0fbcf 100644
} }
static void static void
@@ -1752,6 +1778,13 @@ terminal_screen_do_popup (TerminalScreen *screen, @@ -1755,6 +1781,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
terminal_screen_popup_info_unref (info); terminal_screen_popup_info_unref (info);
} }
@ -434,7 +434,7 @@ index 11d93419..61857bfe 100644
2.39.1 2.39.1
From 65f3ece2a95a9ec950d7be7b63cd1a5acc2731b7 Mon Sep 17 00:00:00 2001 From 9595e1caf59c79d51845ef28683fa8af5ab545a7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 18 May 2018 20:15:34 +0200 Date: Fri, 18 May 2018 20:15:34 +0200
Subject: [PATCH 04/16] screen: Try harder to find a foreground process group Subject: [PATCH 04/16] screen: Try harder to find a foreground process group
@ -460,10 +460,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 29 insertions(+), 1 deletion(-) 1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 85f0fbcf..a973aa87 100644 index 51fdc20b..82c607a2 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -2343,7 +2343,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, @@ -2346,7 +2346,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
#else #else
g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid); g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid);
if (!g_file_get_contents (filename, &data_buf, &len, nullptr)) if (!g_file_get_contents (filename, &data_buf, &len, nullptr))
@ -504,7 +504,7 @@ index 85f0fbcf..a973aa87 100644
2.39.1 2.39.1
From a80239410e4baf22ee57857d77ec469cbd2921dd Mon Sep 17 00:00:00 2001 From 9f2a48802baa0e292b7b717c7acec69213d25b3d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 3 May 2018 16:49:28 +0200 Date: Thu, 3 May 2018 16:49:28 +0200
Subject: [PATCH 05/16] screen: Track the current foreground process Subject: [PATCH 05/16] screen: Track the current foreground process
@ -550,7 +550,7 @@ index fedc9e4d..94f0e30b 100644
void _terminal_debug_init(void); void _terminal_debug_init(void);
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index a973aa87..e5400940 100644 index 82c607a2..5de5ce91 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -112,6 +112,11 @@ struct _TerminalScreenPrivate @@ -112,6 +112,11 @@ struct _TerminalScreenPrivate
@ -615,7 +615,7 @@ index a973aa87..e5400940 100644
G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
} }
@@ -1966,6 +1993,125 @@ terminal_screen_child_exited (VteTerminal *terminal, @@ -1969,6 +1996,125 @@ terminal_screen_child_exited (VteTerminal *terminal,
} }
} }
@ -741,7 +741,7 @@ index a973aa87..e5400940 100644
static void static void
terminal_screen_drag_data_received (GtkWidget *widget, terminal_screen_drag_data_received (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
@@ -2312,7 +2458,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, @@ -2315,7 +2461,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
if (fd == -1) if (fd == -1)
return FALSE; return FALSE;
@ -757,7 +757,7 @@ index a973aa87..e5400940 100644
2.39.1 2.39.1
From 5de49ccd79b557223f0cbbfb8254ec9319502f18 Mon Sep 17 00:00:00 2001 From 4134bd975de2da24a4cd4428e0d7c82474992fbd Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 10 May 2018 19:23:16 +0200 Date: Thu, 10 May 2018 19:23:16 +0200
Subject: [PATCH 06/16] Notify when a long-running foreground process group Subject: [PATCH 06/16] Notify when a long-running foreground process group
@ -778,10 +778,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
4 files changed, 174 insertions(+), 1 deletion(-) 4 files changed, 174 insertions(+), 1 deletion(-)
diff --git a/src/terminal-app.cc b/src/terminal-app.cc diff --git a/src/terminal-app.cc b/src/terminal-app.cc
index 70933a68..1f90a66b 100644 index b6740e3c..f8ea76fe 100644
--- a/src/terminal-app.cc --- a/src/terminal-app.cc
+++ b/src/terminal-app.cc +++ b/src/terminal-app.cc
@@ -848,6 +848,31 @@ app_menu_quit_cb (GSimpleAction *action, @@ -850,6 +850,31 @@ app_menu_quit_cb (GSimpleAction *action,
gtk_widget_destroy (GTK_WIDGET (window)); gtk_widget_destroy (GTK_WIDGET (window));
} }
@ -813,7 +813,7 @@ index 70933a68..1f90a66b 100644
#endif /* TERMINAL_SERVER */ #endif /* TERMINAL_SERVER */
/* Class implementation */ /* Class implementation */
@@ -890,9 +915,16 @@ terminal_app_startup (GApplication *application) @@ -892,9 +917,16 @@ terminal_app_startup (GApplication *application)
{ "quit", app_menu_quit_cb, nullptr, nullptr, nullptr } { "quit", app_menu_quit_cb, nullptr, nullptr, nullptr }
}; };
@ -831,7 +831,7 @@ index 70933a68..1f90a66b 100644
/* Figure out whether the shell shows the menubar */ /* Figure out whether the shell shows the menubar */
gboolean shell_shows_menubar; gboolean shell_shows_menubar;
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index e5400940..219c051a 100644 index 5de5ce91..4d610170 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
@ -872,7 +872,7 @@ index e5400940..219c051a 100644
/* Unset child PID so that when an eventual child-exited signal arrives, /* Unset child PID so that when an eventual child-exited signal arrives,
* we don't emit "close". * we don't emit "close".
@@ -1897,6 +1907,45 @@ terminal_screen_button_press (GtkWidget *widget, @@ -1900,6 +1910,45 @@ terminal_screen_button_press (GtkWidget *widget,
return FALSE; return FALSE;
} }
@ -918,7 +918,7 @@ index e5400940..219c051a 100644
/** /**
* terminal_screen_get_current_dir: * terminal_screen_get_current_dir:
* @screen: * @screen:
@@ -2042,6 +2091,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) @@ -2045,6 +2094,63 @@ terminal_screen_contents_changed (VteTerminal *terminal)
screen); screen);
} }
@ -982,7 +982,7 @@ index e5400940..219c051a 100644
static void static void
terminal_screen_shell_precmd (VteTerminal *terminal) terminal_screen_shell_precmd (VteTerminal *terminal)
{ {
@@ -2064,6 +2170,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) @@ -2067,6 +2173,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
priv->shell_preexec_source_id = 0; priv->shell_preexec_source_id = 0;
} }
@ -1073,7 +1073,7 @@ index 91b7e617..37e808a7 100644
2.39.1 2.39.1
From f17dfaef169d3563ff62f4e0e41483c316040982 Mon Sep 17 00:00:00 2001 From dc370338138e1e0c2113aa1c1710706e82168998 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 15:39:35 +0200 Date: Tue, 10 Apr 2018 15:39:35 +0200
Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids
@ -1348,7 +1348,7 @@ index f3979307..285a3c61 100644
2.39.1 2.39.1
From 020367f3110a0c8fe513b562aae43aea98a1264e Mon Sep 17 00:00:00 2001 From f2a15a477bd4996d8cf5651019fd39381222c1f7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 16:01:51 +0200 Date: Tue, 10 Apr 2018 16:01:51 +0200
Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading" Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading"
@ -1641,7 +1641,7 @@ index 285a3c61..5422de71 100644
2.39.1 2.39.1
From 052881d7c856ecfd4397ffd26db064b83cc1d9ac Mon Sep 17 00:00:00 2001 From cece116e954f4b9f908ee39a9c62c358226fcb31 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:02:13 +0200 Date: Thu, 30 Jun 2016 16:02:13 +0200
Subject: [PATCH 09/16] Revert "screen: Remove unused description and Subject: [PATCH 09/16] Revert "screen: Remove unused description and
@ -1656,7 +1656,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
2 files changed, 69 insertions(+) 2 files changed, 69 insertions(+)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 219c051a..f22bcf65 100644 index 4d610170..8b37de55 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -116,6 +116,7 @@ struct _TerminalScreenPrivate @@ -116,6 +116,7 @@ struct _TerminalScreenPrivate
@ -1746,7 +1746,7 @@ index 219c051a..f22bcf65 100644
} }
GSettings* GSettings*
@@ -1655,6 +1686,8 @@ spawn_result_cb (VteTerminal *terminal, @@ -1658,6 +1689,8 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid; priv->child_pid = pid;
@ -1755,7 +1755,7 @@ index 219c051a..f22bcf65 100644
if (error) { if (error) {
// FIXMEchpe should be unnecessary, vte already does this internally // FIXMEchpe should be unnecessary, vte already does this internally
vte_terminal_set_pty (terminal, nullptr); vte_terminal_set_pty (terminal, nullptr);
@@ -1946,6 +1979,35 @@ terminal_screen_focus_in (GtkWidget *widget, @@ -1949,6 +1982,35 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
} }
@ -1791,7 +1791,7 @@ index 219c051a..f22bcf65 100644
/** /**
* terminal_screen_get_current_dir: * terminal_screen_get_current_dir:
* @screen: * @screen:
@@ -1999,6 +2061,8 @@ terminal_screen_child_exited (VteTerminal *terminal, @@ -2002,6 +2064,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1; priv->child_pid = -1;
@ -1821,7 +1821,7 @@ index ded6b8ca..f4ec9047 100644
2.39.1 2.39.1
From b51278e3fefc940b75e2b7581638f93efcf9f32b Mon Sep 17 00:00:00 2001 From 2278be9ad1c024fcc6b6f0d5c6f711cae18d46c0 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 17:39:48 +0200 Date: Thu, 30 Jun 2016 17:39:48 +0200
Subject: [PATCH 10/16] Revert "Remove the static title setting from profile Subject: [PATCH 10/16] Revert "Remove the static title setting from profile
@ -1966,7 +1966,7 @@ index c33723bf..d0f111a0 100644
#define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey"
#define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font" #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index f22bcf65..8949d135 100644 index 8b37de55..506ab66e 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -1059,11 +1059,14 @@ char * @@ -1059,11 +1059,14 @@ char *
@ -2001,7 +2001,7 @@ index f22bcf65..8949d135 100644
2.39.1 2.39.1
From 06df6eeaf16709f235d9eeb49a1be9ed606aa3f7 Mon Sep 17 00:00:00 2001 From 49963765569cedf8780c829a912bae05e67d7eb0 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 17:06:17 +0100 Date: Tue, 17 Feb 2015 17:06:17 +0100
Subject: [PATCH 11/16] Restore translations for setting a title and Subject: [PATCH 11/16] Restore translations for setting a title and
@ -2036,12 +2036,12 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/es.po | 16 +++++------ po/es.po | 16 +++++------
po/et.po | 3 ++ po/et.po | 3 ++
po/eu.po | 12 ++++++++ po/eu.po | 12 ++++++++
po/fa.po | 15 ++++++---- po/fa.po | 18 ++++++++----
po/fi.po | 12 ++++++++ po/fi.po | 12 ++++++++
po/fr.po | 24 ++++++++++++++++ po/fr.po | 24 ++++++++++++++++
po/fur.po | 11 ++++++-- po/fur.po | 11 ++++++--
po/ga.po | 3 ++ po/ga.po | 3 ++
po/gl.po | 12 ++++++++ po/gl.po | 15 ++++++----
po/gu.po | 16 +++++------ po/gu.po | 16 +++++------
po/he.po | 16 +++++------ po/he.po | 16 +++++------
po/hi.po | 17 ++++++------ po/hi.po | 17 ++++++------
@ -2100,7 +2100,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/zh_CN.po | 15 ++++++---- po/zh_CN.po | 15 ++++++----
po/zh_HK.po | 15 ++++++---- po/zh_HK.po | 15 ++++++----
po/zh_TW.po | 15 ++++++---- po/zh_TW.po | 15 ++++++----
92 files changed, 734 insertions(+), 386 deletions(-) 92 files changed, 734 insertions(+), 392 deletions(-)
diff --git a/po/am.po b/po/am.po diff --git a/po/am.po b/po/am.po
index 3445d96d..ee992f07 100644 index 3445d96d..ee992f07 100644
@ -2608,10 +2608,10 @@ index d97e6102..a768fe4a 100644
#: ../src/profile-preferences.glade.h:78 #: ../src/profile-preferences.glade.h:78
#, fuzzy #, fuzzy
diff --git a/po/el.po b/po/el.po diff --git a/po/el.po b/po/el.po
index a82659e6..d814147c 100644 index 5fdb4c72..015e397c 100644
--- a/po/el.po --- a/po/el.po
+++ b/po/el.po +++ b/po/el.po
@@ -2915,17 +2915,17 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" @@ -2917,17 +2917,17 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n"
#~ msgid "Default size:" #~ msgid "Default size:"
#~ msgstr "Προεπιλεγμένο μέγεθος:" #~ msgstr "Προεπιλεγμένο μέγεθος:"
@ -2635,7 +2635,7 @@ index a82659e6..d814147c 100644
#~ msgid "Current Locale" #~ msgid "Current Locale"
#~ msgstr "Τρέχουσα τοπική ρύθμιση" #~ msgstr "Τρέχουσα τοπική ρύθμιση"
@@ -2963,3 +2963,6 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" @@ -2965,3 +2965,6 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n"
#~ msgid "_Input Methods" #~ msgid "_Input Methods"
#~ msgstr "_Μέθοδοι εισαγωγής" #~ msgstr "_Μέθοδοι εισαγωγής"
@ -2839,21 +2839,24 @@ index 56f3f1df..6d9680dc 100644
+msgid "Transparent background" +msgid "Transparent background"
+msgstr "Atzeko plano gardena" +msgstr "Atzeko plano gardena"
diff --git a/po/fa.po b/po/fa.po diff --git a/po/fa.po b/po/fa.po
index 70ffa07d..8b746710 100644 index 33213f05..c657f57e 100644
--- a/po/fa.po --- a/po/fa.po
+++ b/po/fa.po +++ b/po/fa.po
@@ -2793,8 +2793,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" @@ -2794,8 +2794,11 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n"
#~ msgid "Use custom default terminal si_ze" #~ msgid "_Font:"
#~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض" #~ msgstr "_قلم:"
-#~ msgid "Title" -#~ msgid "Title"
-#~ msgstr "عنوان" -#~ msgstr "عنوان"
+#~ msgid "Use custom default terminal si_ze"
+#~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض"
+
+msgid "Title" +msgid "Title"
+msgstr "عنوان" +msgstr "عنوان"
#~ msgid "When terminal commands set their o_wn titles:" #~ msgid "When terminal commands set their o_wn titles:"
#~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:" #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:"
@@ -2808,8 +2808,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" @@ -2809,8 +2812,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n"
#~ msgid "_Unlimited" #~ msgid "_Unlimited"
#~ msgstr "_نامحدود" #~ msgstr "_نامحدود"
@ -2864,7 +2867,7 @@ index 70ffa07d..8b746710 100644
#~ msgid "Switch to Tab 3" #~ msgid "Switch to Tab 3"
#~ msgstr "تعویض به زبانه‌ی ۳" #~ msgstr "تعویض به زبانه‌ی ۳"
@@ -2850,5 +2850,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" @@ -2851,5 +2854,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n"
#~ msgid "_Input Methods" #~ msgid "_Input Methods"
#~ msgstr "روش‌های _ورودی" #~ msgstr "روش‌های _ورودی"
@ -2934,10 +2937,10 @@ index 3a9ee71e..64d56414 100644
+msgid "Set Title" +msgid "Set Title"
+msgstr "Définir le titre" +msgstr "Définir le titre"
diff --git a/po/fur.po b/po/fur.po diff --git a/po/fur.po b/po/fur.po
index edbba329..87755fc1 100644 index 09946141..0f1e81e3 100644
--- a/po/fur.po --- a/po/fur.po
+++ b/po/fur.po +++ b/po/fur.po
@@ -557,6 +557,10 @@ msgstr "" @@ -483,6 +483,10 @@ msgstr ""
msgid "Which encoding to use" msgid "Which encoding to use"
msgstr "Codifiche di doprâ" msgstr "Codifiche di doprâ"
@ -2948,7 +2951,7 @@ index edbba329..87755fc1 100644
#: src/org.gnome.Terminal.gschema.xml:350 #: src/org.gnome.Terminal.gschema.xml:350
msgid "" msgid ""
"Whether ambiguous-width characters are narrow or wide when using UTF-8 " "Whether ambiguous-width characters are narrow or wide when using UTF-8 "
@@ -3576,6 +3580,9 @@ msgstr "Analisi dai argoments falide: %s\n" @@ -3588,6 +3592,9 @@ msgstr "Analisi dai argoments falide: %s\n"
#~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge."
#~ msgstr "Il test fracât nol samee jessi un OTP challenge." #~ msgstr "Il test fracât nol samee jessi un OTP challenge."
@ -2958,7 +2961,7 @@ index edbba329..87755fc1 100644
#~ msgid "Switch to Tab 3" #~ msgid "Switch to Tab 3"
#~ msgstr "Passe a la schede 3" #~ msgstr "Passe a la schede 3"
@@ -3631,8 +3638,8 @@ msgstr "Analisi dai argoments falide: %s\n" @@ -3643,8 +3650,8 @@ msgstr "Analisi dai argoments falide: %s\n"
#~ msgid "_Input Methods" #~ msgid "_Input Methods"
#~ msgstr "_Cemût inserî test" #~ msgstr "_Cemût inserî test"
@ -2967,8 +2970,8 @@ index edbba329..87755fc1 100644
+msgid "_Title:" +msgid "_Title:"
+msgstr "_Titul:" +msgstr "_Titul:"
#~ msgid "" #~ msgid "text/plain dropped on terminal had wrong format (%d) or length (%d)\n"
#~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" #~ msgstr ""
diff --git a/po/ga.po b/po/ga.po diff --git a/po/ga.po b/po/ga.po
index 93d5fa9d..feb87dce 100644 index 93d5fa9d..feb87dce 100644
--- a/po/ga.po --- a/po/ga.po
@ -2981,20 +2984,25 @@ index 93d5fa9d..feb87dce 100644
+msgid "Transparent background" +msgid "Transparent background"
+msgstr "Cúlra trédhearcach" +msgstr "Cúlra trédhearcach"
diff --git a/po/gl.po b/po/gl.po diff --git a/po/gl.po b/po/gl.po
index 00325496..8c6f3472 100644 index c0dc3349..adea6024 100644
--- a/po/gl.po --- a/po/gl.po
+++ b/po/gl.po +++ b/po/gl.po
@@ -2480,3 +2480,15 @@ msgstr "P_echar a xanela" @@ -2500,11 +2500,14 @@ msgstr "P_echar a xanela"
#, c-format
msgid "Failed to parse arguments: %s\n" msgid "Failed to parse arguments: %s\n"
msgstr "Produciuse un erro ao analizar os argumentos: %s\n" msgstr "Produciuse un erro ao analizar os argumentos: %s\n"
+
-#~ msgid "org.gnome.Terminal"
-#~ msgstr "org.gnome.Terminal"
+msgid "Title" +msgid "Title"
+msgstr "Título" +msgstr "Título"
+
-#~ msgid "Armenian"
-#~ msgstr "Armenio"
+msgid "_Title:" +msgid "_Title:"
+msgstr "_Título:" +msgstr "_Título:"
+
-#~ msgid "Georgian"
-#~ msgstr "Xeorxiano"
+msgid "Set Title" +msgid "Set Title"
+msgstr "Definir o título" +msgstr "Definir o título"
+ +
@ -3137,10 +3145,10 @@ index 2d7dc5b1..8d3d0529 100644
#~ msgid "S/Key Challenge Response" #~ msgid "S/Key Challenge Response"
#~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
diff --git a/po/hr.po b/po/hr.po diff --git a/po/hr.po b/po/hr.po
index 0c65eca2..1472cbb1 100644 index aa384812..4a28d9ae 100644
--- a/po/hr.po --- a/po/hr.po
+++ b/po/hr.po +++ b/po/hr.po
@@ -2763,3 +2763,13 @@ msgstr "Greška u obradi argumenata: %s\n" @@ -2771,3 +2771,13 @@ msgstr "Greška u obradi argumenata: %s\n"
#~ msgid "Use transparency from system theme" #~ msgid "Use transparency from system theme"
#~ msgstr "Koristi prozirnost iz teme sustava" #~ msgstr "Koristi prozirnost iz teme sustava"
@ -3395,10 +3403,10 @@ index bc2bb7f0..d2a83a00 100644
#: ../src/gnome-terminal.glade2.h:87 #: ../src/gnome-terminal.glade2.h:87
msgid "_Update login records when command is launched" msgid "_Update login records when command is launched"
diff --git a/po/lt.po b/po/lt.po diff --git a/po/lt.po b/po/lt.po
index c2729c2f..55165274 100644 index 59d8bf7a..df3411a0 100644
--- a/po/lt.po --- a/po/lt.po
+++ b/po/lt.po +++ b/po/lt.po
@@ -2770,3 +2770,15 @@ msgstr "Nepavyko apdoroti argumentų: %s\n" @@ -2773,3 +2773,15 @@ msgstr "Nepavyko apdoroti argumentų: %s\n"
#~ msgid "Whether to use a dark theme variant" #~ msgid "Whether to use a dark theme variant"
#~ msgstr "Ar naudoti tamsų temos variantą" #~ msgstr "Ar naudoti tamsų temos variantą"
@ -3745,10 +3753,10 @@ index 5aa43b11..f892290c 100644
#: ../src/profile-preferences.glade.h:74 #: ../src/profile-preferences.glade.h:74
msgid "_Update login records when command is launched" msgid "_Update login records when command is launched"
diff --git a/po/oc.po b/po/oc.po diff --git a/po/oc.po b/po/oc.po
index d7cddaec..7eab4a47 100644 index fff47e6f..67380961 100644
--- a/po/oc.po --- a/po/oc.po
+++ b/po/oc.po +++ b/po/oc.po
@@ -3031,8 +3031,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" @@ -3034,8 +3034,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n"
#~ msgid "Save as..." #~ msgid "Save as..."
#~ msgstr "Enregistrar jos..." #~ msgstr "Enregistrar jos..."
@ -3759,7 +3767,7 @@ index d7cddaec..7eab4a47 100644
#~ msgid "_Detach tab" #~ msgid "_Detach tab"
#~ msgstr "Des_tacar l'onglet" #~ msgstr "Des_tacar l'onglet"
@@ -3492,8 +3492,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" @@ -3495,8 +3495,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n"
#~ msgid "_Use the system fixed width font" #~ msgid "_Use the system fixed width font"
#~ msgstr "_Utilizar la poliça de chassa fixa del sistèma" #~ msgstr "_Utilizar la poliça de chassa fixa del sistèma"
@ -3921,10 +3929,10 @@ index 1ff7e2f3..6078ee79 100644
#~ msgid "S_hade transparent or image background:" #~ msgid "S_hade transparent or image background:"
#~ msgstr "Transparente som_breado ou imagem de fundo:" #~ msgstr "Transparente som_breado ou imagem de fundo:"
diff --git a/po/pt_BR.po b/po/pt_BR.po diff --git a/po/pt_BR.po b/po/pt_BR.po
index dbdfda9e..f44ff3e7 100644 index 4fac562a..117f63bb 100644
--- a/po/pt_BR.po --- a/po/pt_BR.po
+++ b/po/pt_BR.po +++ b/po/pt_BR.po
@@ -2482,3 +2482,15 @@ msgstr "_Fechar janela" @@ -2423,3 +2423,15 @@ msgstr "_Fechar janela"
#, c-format #, c-format
msgid "Failed to parse arguments: %s\n" msgid "Failed to parse arguments: %s\n"
msgstr "Falha ao analisar os argumentos: %s\n" msgstr "Falha ao analisar os argumentos: %s\n"
@ -4776,7 +4784,7 @@ index 80cb2343..20e2a93c 100644
2.39.1 2.39.1
From 2d149670cb2c6c123081622193a7eb4c93a66f05 Mon Sep 17 00:00:00 2001 From f147f5e46089985b0d2467c385ebe5357e58ce1b Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 25 May 2016 13:47:36 +0200 Date: Wed, 25 May 2016 13:47:36 +0200
Subject: [PATCH 12/16] Restore the action and shortcut to set a static title Subject: [PATCH 12/16] Restore the action and shortcut to set a static title
@ -4925,7 +4933,7 @@ index 61857bfe..98332c6d 100644
2.39.1 2.39.1
From 7a827a8ee62d97a871d2f0e17dd3ea2ee8e6f716 Mon Sep 17 00:00:00 2001 From a95c511a3ac41fa979aa6c59ca5ca8e30975d9fd Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 18:14:36 +0200 Date: Thu, 30 Jun 2016 18:14:36 +0200
Subject: [PATCH 13/16] screen: Style fix Subject: [PATCH 13/16] screen: Style fix
@ -4939,7 +4947,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 8949d135..c48b5875 100644 index 506ab66e..28088a98 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -819,7 +819,7 @@ terminal_screen_new (GSettings *profile, @@ -819,7 +819,7 @@ terminal_screen_new (GSettings *profile,
@ -4955,7 +4963,7 @@ index 8949d135..c48b5875 100644
2.39.1 2.39.1
From 857f6b73bfb6f479dd42369c5554497cf0b8eb45 Mon Sep 17 00:00:00 2001 From e81ecefd0aff94d3fbd939c824d7be9bd703a691 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:58:15 +0200 Date: Thu, 30 Jun 2016 16:58:15 +0200
Subject: [PATCH 14/16] Restore the rest of the title handling options and make Subject: [PATCH 14/16] Restore the rest of the title handling options and make
@ -5110,7 +5118,7 @@ index d0f111a0..1c67e55d 100644
#define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command"
#define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index c48b5875..547ec12e 100644 index 28088a98..5456839a 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -115,8 +115,11 @@ struct _TerminalScreenPrivate @@ -115,8 +115,11 @@ struct _TerminalScreenPrivate
@ -5406,7 +5414,7 @@ index c48b5875..547ec12e 100644
} }
GSettings* GSettings*
@@ -1695,8 +1786,6 @@ spawn_result_cb (VteTerminal *terminal, @@ -1698,8 +1789,6 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid; priv->child_pid = pid;
@ -5415,7 +5423,7 @@ index c48b5875..547ec12e 100644
if (error) { if (error) {
// FIXMEchpe should be unnecessary, vte already does this internally // FIXMEchpe should be unnecessary, vte already does this internally
vte_terminal_set_pty (terminal, nullptr); vte_terminal_set_pty (terminal, nullptr);
@@ -1988,33 +2077,45 @@ terminal_screen_focus_in (GtkWidget *widget, @@ -1991,33 +2080,45 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
} }
@ -5475,7 +5483,7 @@ index c48b5875..547ec12e 100644
} }
/** /**
@@ -2047,7 +2148,9 @@ static void @@ -2050,7 +2151,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal, terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen) TerminalScreen *screen)
{ {
@ -5486,7 +5494,7 @@ index c48b5875..547ec12e 100644
} }
static void static void
@@ -2070,8 +2173,6 @@ terminal_screen_child_exited (VteTerminal *terminal, @@ -2073,8 +2176,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1; priv->child_pid = -1;
@ -5495,7 +5503,7 @@ index c48b5875..547ec12e 100644
action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY));
switch (action) switch (action)
@@ -2115,6 +2216,23 @@ terminal_screen_child_exited (VteTerminal *terminal, @@ -2118,6 +2219,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
} }
} }
@ -5574,7 +5582,7 @@ index 98332c6d..389d4d71 100644
2.39.1 2.39.1
From e509ea2cab9463dd391836db3937ef0503c8652c Mon Sep 17 00:00:00 2001 From 64ed3ae56e93722bf8be306e4afc02f5776145b1 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 3 Apr 2019 15:38:09 +0200 Date: Wed, 3 Apr 2019 15:38:09 +0200
Subject: [PATCH 15/16] Update the title with the current foreground process Subject: [PATCH 15/16] Update the title with the current foreground process
@ -5619,7 +5627,7 @@ index 1c67e55d..443ebae4 100644
#define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode" #define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode"
#define TERMINAL_PROFILE_TITLE_KEY "title" #define TERMINAL_PROFILE_TITLE_KEY "title"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 547ec12e..fe410fdf 100644 index 5456839a..177431d0 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -114,7 +114,9 @@ struct _TerminalScreenPrivate @@ -114,7 +114,9 @@ struct _TerminalScreenPrivate
@ -5700,7 +5708,7 @@ index 547ec12e..fe410fdf 100644
g_object_thaw_notify (object); g_object_thaw_notify (object);
} }
@@ -2148,6 +2181,9 @@ static void @@ -2151,6 +2184,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal, terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen) TerminalScreen *screen)
{ {
@ -5710,7 +5718,7 @@ index 547ec12e..fe410fdf 100644
terminal_screen_set_dynamic_title (screen, terminal_screen_set_dynamic_title (screen,
vte_terminal_get_window_title (vte_terminal), vte_terminal_get_window_title (vte_terminal),
FALSE); FALSE);
@@ -2255,6 +2291,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) @@ -2258,6 +2294,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
cmdline = nullptr; cmdline = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
@ -5719,7 +5727,7 @@ index 547ec12e..fe410fdf 100644
out: out:
priv->contents_changed_source_id = 0; priv->contents_changed_source_id = 0;
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
@@ -2347,6 +2385,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) @@ -2350,6 +2388,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n");
@ -5727,7 +5735,7 @@ index 547ec12e..fe410fdf 100644
priv->between_preexec_and_precmd = FALSE; priv->between_preexec_and_precmd = FALSE;
if (priv->contents_changed_source_id != 0) if (priv->contents_changed_source_id != 0)
@@ -2366,6 +2405,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) @@ -2369,6 +2408,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
g_clear_pointer (&priv->current_cmdline, g_free); g_clear_pointer (&priv->current_cmdline, g_free);
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n"); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n");
@ -5736,7 +5744,7 @@ index 547ec12e..fe410fdf 100644
} }
static gboolean static gboolean
@@ -2387,6 +2428,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) @@ -2390,6 +2431,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
cmdline = nullptr; cmdline = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
@ -5749,7 +5757,7 @@ index 547ec12e..fe410fdf 100644
2.39.1 2.39.1
From 270d60c07f79325cf5488a836cb20a32d827d004 Mon Sep 17 00:00:00 2001 From bbaedcfdb5006a2f744f97924312fd5e9cba9a0b Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 27 Feb 2020 19:32:08 +0100 Date: Thu, 27 Feb 2020 19:32:08 +0100
Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any
@ -5765,7 +5773,7 @@ https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
3 files changed, 62 insertions(+), 3 deletions(-) 3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index fe410fdf..4fc15e04 100644 index 177431d0..3ce7fc05 100644
--- a/src/terminal-screen.cc --- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc +++ b/src/terminal-screen.cc
@@ -862,6 +862,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, @@ -862,6 +862,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,

5
gnome-terminal.spec
View File

@ -7,7 +7,7 @@
%define desktop_file_utils_version 0.2.90 %define desktop_file_utils_version 0.2.90
Name: gnome-terminal Name: gnome-terminal
Version: 3.46.7 Version: 3.46.8
Release: 1%{?dist} Release: 1%{?dist}
Summary: Terminal emulator for GNOME Summary: Terminal emulator for GNOME
@ -112,6 +112,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de
%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml %{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog %changelog
* Thu Feb 16 2023 David King <amigadave@amigadave.com> - 3.46.8-1
- Update to 3.46.8
* Mon Jan 23 2023 David King <amigadave@amigadave.com> - 3.46.7-1 * Mon Jan 23 2023 David King <amigadave@amigadave.com> - 3.46.7-1
- Update to 3.46.7 (#2155523) - Update to 3.46.7 (#2155523)

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-terminal-3.46.7.tar.bz2) = b53ec9fd1bd18e51dfc9d5d957082fb1478a824ceb098b0dda2ed8417c4cae4727435f4bce22a949214bdd39abc87821beb36c9e9863691ae0a20f11b34e3335 SHA512 (gnome-terminal-3.46.8.tar.bz2) = 07b8b9a31d5c1f87ff6d9902b56bfe1eb75b32f25e5b5c97448f990f4c4d6ca73709e5af30e09701d2dc55331a33b6f006fdcc696d5c9ffa83e50919ac74fdfc