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

Update to 3.45.90

Browse Source
This commit is contained in:
David King 2022-08-17 11:24:30 +01:00
parent c0e8ed8c00
commit 26c20042c6
5 changed files with 368 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,190 @@
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 Normal file
View File

@ -0,0 +1,51 @@
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

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

@ -1,301 +1,7 @@
From d45f7110f6774c1eaf334fc11bae1311e7e36ac1 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 01/18] 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.35.1
From 79ff1e786c63a7e40dc433499949b2ae7112c47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Fri, 24 Sep 2021 15:06:52 +0200
Subject: [PATCH 02/18] Updated Czech translation
---
po/cs.po | 120 +++++++++++--------------------------------------------
1 file changed, 23 insertions(+), 97 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 1beaf216..5a4d02a4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,10 +14,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnome-terminal\n"
+"Project-Id-Version: gnome-terminal gnome-41\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
-"POT-Creation-Date: 2021-07-31 12:57+0000\n"
-"PO-Revision-Date: 2021-02-07 19:52+0100\n"
+"POT-Creation-Date: 2021-09-22 16:39+0000\n"
+"PO-Revision-Date: 2021-09-24 15:05+0200\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
"Language: cs\n"
@@ -28,32 +28,14 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:35
-msgid "org.gnome.Terminal.Nautilus"
-msgstr ""
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36
-msgid "org.gnome.Nautilus.desktop"
-msgstr ""
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:37
-#: data/org.gnome.Terminal.metainfo.xml.in:36
-msgid "GPL-3.0+ or GFDL-1.3-only"
-msgstr "GPL-3.0+ nebo GFDL-1.3 výhradně"
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38
-#: data/org.gnome.Terminal.metainfo.xml.in:37
-msgid "GPL-3.0+"
-msgstr "GPL-3.0+"
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:39
msgid "Terminal plugin for Files"
msgstr "Zásuvný modul Terminál pro Soubory"
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:40
+#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36
msgid "Open a terminal from Files"
msgstr "Otevírá terminál z aplikace Soubory"
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:42
+#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38
msgid ""
"Open Terminal is a plugin for the Files application that adds a menu item to "
"the context menu to open a terminal in the currently browsed directory."
@@ -61,28 +43,8 @@ msgstr ""
"Otevřít terminál je zásuvný modul pro aplikaci Soubory, který přidává do "
"kontextové nabídky položku pro otevření terminálu v právě procházené složce."
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:44
-#: data/org.gnome.Terminal.metainfo.xml.in:59
-msgid "https://wiki.gnome.org/Apps/Terminal"
-msgstr "https://wiki.gnome.org/Apps/Terminal"
-
-#. This is the name of a colour scheme
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:45
-#: data/org.gnome.Terminal.metainfo.xml.in:60 src/preferences.ui:214
-msgid "GNOME"
-msgstr "GNOME"
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:46
-#: data/org.gnome.Terminal.metainfo.xml.in:61
-msgid "https://wiki.gnome.org/Apps/Terminal/ReportingBugs"
-msgstr "https://wiki.gnome.org/Apps/Terminal/ReportingBugs"
-
-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:47
-msgid "gnome-terminal"
-msgstr ""
-
#: data/org.gnome.Terminal.desktop.in:3
-#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150
+#: data/org.gnome.Terminal.metainfo.xml.in:34 src/server.cc:150
#: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144
#: src/terminal-tab-label.cc:81 src/terminal-window.cc:1894
#: src/terminal-window.cc:2160 src/terminal-window.cc:2443 src/terminal.cc:570
@@ -90,7 +52,7 @@ msgid "Terminal"
msgstr "Terminál"
#: data/org.gnome.Terminal.desktop.in:4
-#: data/org.gnome.Terminal.metainfo.xml.in:39
+#: data/org.gnome.Terminal.metainfo.xml.in:35
msgid "Use the command line"
msgstr "Používejte příkazový řádek"
@@ -100,7 +62,7 @@ msgstr "shell;prompt;výzva;příkaz;příkazový řádek;příkazová řádka;"
#: data/org.gnome.Terminal.desktop.in:8
msgid "org.gnome.Terminal"
-msgstr ""
+msgstr "org.gnome.Terminal"
#: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127
msgid "New Window"
@@ -110,11 +72,7 @@ msgstr "Nové okno"
msgid "Preferences"
msgstr "Předvolby"
-#: data/org.gnome.Terminal.metainfo.xml.in:35
-msgid "org.gnome.Terminal.desktop"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:41
+#: data/org.gnome.Terminal.metainfo.xml.in:37
msgid ""
"GNOME Terminal is a terminal emulator application for accessing a UNIX shell "
"environment which can be used to run programs available on your system."
@@ -123,51 +81,13 @@ msgstr ""
"UNIXového shellu a v něm umožňuje spouštět programy dostupné ve vašem "
"systému."
-#: data/org.gnome.Terminal.metainfo.xml.in:42
+#: data/org.gnome.Terminal.metainfo.xml.in:38
msgid ""
"It supports several profiles, multiple tabs and implements several keyboard "
"shortcuts."
msgstr ""
"Podporuje více profilů, více terminálů v kartách a řadu klávesových zkratek."
-#: data/org.gnome.Terminal.metainfo.xml.in:45
-msgid "console"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:46
-msgid "keyboard"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:47
-msgid "pointing"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:50
-msgid ""
-"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png"
-msgstr ""
-"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png"
-
-#: data/org.gnome.Terminal.metainfo.xml.in:53
-msgid "HiDpiIcon"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:54
-msgid "HighContrast"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:55
-msgid "ModernToolkit"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:56
-msgid "SearchProvider"
-msgstr ""
-
-#: data/org.gnome.Terminal.metainfo.xml.in:57
-msgid "UserDocs"
-msgstr ""
-
#. Translators: Keep single quote please!
#: src/org.gnome.Terminal.gschema.xml:133
msgctxt "visible-name"
@@ -959,6 +879,11 @@ msgstr "spustit příkaz znovu"
msgid "Hold the terminal open"
msgstr "nechat terminál otevřený"
+#. This is the name of a colour scheme
+#: src/preferences.ui:214
+msgid "GNOME"
+msgstr "GNOME"
+
#. This is the name of a colour scheme
#: src/preferences.ui:217
msgid "Tango"
@@ -1760,7 +1685,7 @@ msgstr "_4. 132 × 42"
msgid "_Inspector"
msgstr "_Inspektor"
-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1540
+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1543
#: src/terminal-window.cc:1788
msgid "_Preferences"
msgstr "_Předvolby"
@@ -2257,29 +2182,29 @@ msgstr "Klávesové zkratky"
msgid "Profiles"
msgstr "Profily"
-#: src/terminal-screen.cc:1425
+#: src/terminal-screen.cc:1428
msgid "No command supplied nor shell requested"
msgstr "Není ani zadán příkaz ani požadován shell"
-#: src/terminal-screen.cc:1541 src/terminal-screen.cc:1888
+#: src/terminal-screen.cc:1544 src/terminal-screen.cc:1891
msgid "_Relaunch"
msgstr "_Spustit znovu"
-#: src/terminal-screen.cc:1544
+#: src/terminal-screen.cc:1547
msgid "There was an error creating the child process for this terminal"
msgstr "Při vytváření procesu potomka pro tento terminál došlo k chybě"
-#: src/terminal-screen.cc:1892
+#: src/terminal-screen.cc:1895
#, c-format
msgid "The child process exited normally with status %d."
msgstr "Proces potomka skončil normálně se stavovým kódem %d."
-#: src/terminal-screen.cc:1895
+#: src/terminal-screen.cc:1898
#, c-format
msgid "The child process was aborted by signal %d."
msgstr "Proces potomka byl zrušen na základě signálu %d."
-#: src/terminal-screen.cc:1898
+#: src/terminal-screen.cc:1901
msgid "The child process was aborted."
msgstr "Proces potomka byl zrušen."
@@ -2452,3 +2377,4 @@ msgstr "_Zavřít okno"
#, c-format
msgid "Failed to parse arguments: %s\n"
msgstr "Selhala analýza argumentů: %s\n"
+
--
2.35.1
From 6ec2b129581d7f381e98a5a6d5a432c40f7ff339 Mon Sep 17 00:00:00 2001
From f5773d45951d62ccc8d8476862779f8f6d3a4ae3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 12 May 2014 14:57:18 +0200
Subject: [PATCH 03/18] Restore transparency
Subject: [PATCH 01/16] Restore transparency
The transparency settings were removed as a side effect of
2bff4b63ed3ceef6055e35563e9b0b33ad57349d
@ -405,10 +111,10 @@ index d1aca7b2..64f8295b 100644
</child>
</object>
diff --git a/src/profile-editor.cc b/src/profile-editor.cc
index a99fb892..3d50524d 100644
index 0cb99b62..d0e71e26 100644
--- a/src/profile-editor.cc
+++ b/src/profile-editor.cc
@@ -1492,6 +1492,25 @@ profile_prefs_load (const char *uuid, GSettings *profile)
@@ -1491,6 +1491,25 @@ profile_prefs_load (const char *uuid, GSettings *profile)
GSettingsBindFlags(G_SETTINGS_BIND_GET |
G_SETTINGS_BIND_SET));
gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0);
@ -449,7 +155,7 @@ index b146ba82..d2917fac 100644
#define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info"
#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index f60b0e32..edca6cde 100644
index 505ad46d..22caa815 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -1055,7 +1055,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
@ -528,13 +234,13 @@ index 76f18000..d739f693 100644
uuid_unparse (u, uuidstr);
priv->uuid = g_strdup (uuidstr);
--
2.35.1
2.37.1
From b68e27ddaf60a38df73130f7752a011b5f888acd Mon Sep 17 00:00:00 2001
From d4bc7178c38ef4f23749aceb3a19f725f38ede2e Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 28 May 2014 14:11:02 +0200
Subject: [PATCH 04/18] window: Make the drawing robust across all themes
Subject: [PATCH 02/16] window: Make the drawing robust across all themes
There are lots of themes out there in the wild that do not specify a
background-color for all widgets and the default is transparent. This
@ -590,13 +296,13 @@ index d739f693..04d977ed 100644
widget_class->screen_changed = terminal_window_screen_changed;
widget_class->style_updated = terminal_window_style_updated;
--
2.35.1
2.37.1
From 989d8498a308cccfbab166d8161c9b6bc75b5d49 Mon Sep 17 00:00:00 2001
From 64780a82bfaabd8207e9f38dfe705455e3e91ce2 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Fri, 13 Nov 2015 15:16:42 +0100
Subject: [PATCH 05/18] screen, window: Extra padding around transparent
Subject: [PATCH 03/16] screen, window: Extra padding around transparent
terminals in Wayland
https://bugzilla.redhat.com/show_bug.cgi?id=1207943
@ -606,7 +312,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
2 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index edca6cde..9ca83c3e 100644
index 22caa815..29c4dcd0 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -152,6 +152,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@ -678,7 +384,7 @@ index edca6cde..9ca83c3e 100644
}
static void
@@ -1729,6 +1755,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
@@ -1747,6 +1773,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
terminal_screen_popup_info_unref (info);
}
@ -725,13 +431,13 @@ index 04d977ed..be8533e6 100644
return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
--
2.35.1
2.37.1
From 590cbd296eb594118ea875fa78e5fb8abe4852d9 Mon Sep 17 00:00:00 2001
From e1347af9d631a9a5685d2975b84ce7d11d1d3ec0 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 18 May 2018 20:15:34 +0200
Subject: [PATCH 06/18] screen: Try harder to find a foreground process group
Subject: [PATCH 04/16] screen: Try harder to find a foreground process group
member
For pipelined commands, it's possible that the process group leader,
@ -754,10 +460,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 9ca83c3e..8a06c6cb 100644
index 29c4dcd0..94911868 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -2320,7 +2320,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
@@ -2338,7 +2338,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
#else
g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid);
if (!g_file_get_contents (filename, &data_buf, &len, nullptr))
@ -795,13 +501,13 @@ index 9ca83c3e..8a06c6cb 100644
#endif
--
2.35.1
2.37.1
From eea4cb07d3bc107960b7d5ae6233ce42649352d9 Mon Sep 17 00:00:00 2001
From c0029d743f65ecfad651a5828ec19ab8d0a57d1f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 3 May 2018 16:49:28 +0200
Subject: [PATCH 07/18] screen: Track the current foreground process
Subject: [PATCH 05/16] screen: Track the current foreground process
... using the interactive shell's precmd and preexec hooks, by
monitoring the contents of the terminal, and a combination of
@ -846,7 +552,7 @@ index 0fafcc3a..b0f2fc9d 100644
void _terminal_debug_init(void);
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 8a06c6cb..ecb5028c 100644
index 94911868..3048d56d 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -108,6 +108,11 @@ struct _TerminalScreenPrivate
@ -911,7 +617,7 @@ index 8a06c6cb..ecb5028c 100644
G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
}
@@ -1943,6 +1970,125 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1961,6 +1988,125 @@ terminal_screen_child_exited (VteTerminal *terminal,
}
}
@ -1037,7 +743,7 @@ index 8a06c6cb..ecb5028c 100644
static void
terminal_screen_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
@@ -2289,7 +2435,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
@@ -2307,7 +2453,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
if (fd == -1)
return FALSE;
@ -1050,13 +756,13 @@ index 8a06c6cb..ecb5028c 100644
return FALSE;
--
2.35.1
2.37.1
From 9fe08b322ad76ec85bbc078d9b5e8ce953c97034 Mon Sep 17 00:00:00 2001
From 45771ee807e8ca920d88f084dd9eefd1099193d8 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 10 May 2018 19:23:16 +0200
Subject: [PATCH 08/18] Notify when a long-running foreground process group
Subject: [PATCH 06/16] Notify when a long-running foreground process group
terminates
Notifications are only sent if the VteTerminal in which the process
@ -1131,7 +837,7 @@ index a06485cf..3eae3b29 100644
app_load_css (application);
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index ecb5028c..fe440a42 100644
index 3048d56d..21d71275 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -55,6 +55,7 @@
@ -1172,7 +878,7 @@ index ecb5028c..fe440a42 100644
/* Unset child PID so that when an eventual child-exited signal arrives,
* we don't emit "close".
@@ -1874,6 +1884,45 @@ terminal_screen_button_press (GtkWidget *widget,
@@ -1892,6 +1902,45 @@ terminal_screen_button_press (GtkWidget *widget,
return FALSE;
}
@ -1218,7 +924,7 @@ index ecb5028c..fe440a42 100644
/**
* terminal_screen_get_current_dir:
* @screen:
@@ -2019,6 +2068,63 @@ terminal_screen_contents_changed (VteTerminal *terminal)
@@ -2037,6 +2086,63 @@ terminal_screen_contents_changed (VteTerminal *terminal)
screen);
}
@ -1282,7 +988,7 @@ index ecb5028c..fe440a42 100644
static void
terminal_screen_shell_precmd (VteTerminal *terminal)
{
@@ -2041,6 +2147,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -2059,6 +2165,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
priv->shell_preexec_source_id = 0;
}
@ -1370,13 +1076,13 @@ index 91b7e617..37e808a7 100644
G_END_DECLS
--
2.35.1
2.37.1
From 994582f739461490e6e5031e9a8180d5b96733fd Mon Sep 17 00:00:00 2001
From cdb622da32321eea96b17a3d602dbb93f16ca9f2 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 15:39:35 +0200
Subject: [PATCH 09/18] profile: Split the Command tab into two nested GtkGrids
Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids
This will let the subsequent patch add a "Command" sub-heading to keep
the command settings separate from the to-be-restored title settings.
@ -1645,13 +1351,13 @@ index 64f8295b..426993a4 100644
</object>
<packing>
--
2.35.1
2.37.1
From a52c4e1b1ee97ce9ec740f8917e02e842f4e51e6 Mon Sep 17 00:00:00 2001
From db1b6910b1c01e1dcc79829a98cee63ed9ee1aad Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 10 Apr 2018 16:01:51 +0200
Subject: [PATCH 10/18] Revert "profile: Remove the "Command" sub-heading"
Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading"
This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c.
@ -1938,13 +1644,13 @@ index 426993a4..7f4a94c8 100644
</object>
<packing>
--
2.35.1
2.37.1
From 76d6b9d8531fbc8c25006b12b3a3426e48bf3e66 Mon Sep 17 00:00:00 2001
From 5c282d45a733a16d1c827d7aa5b43e2041f8fb73 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:02:13 +0200
Subject: [PATCH 11/18] Revert "screen: Remove unused description and
Subject: [PATCH 09/16] Revert "screen: Remove unused description and
user_title API"
This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626.
@ -1956,7 +1662,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
2 files changed, 69 insertions(+)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index fe440a42..39155e1c 100644
index 21d71275..4161debe 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -112,6 +112,7 @@ struct _TerminalScreenPrivate
@ -2046,7 +1752,7 @@ index fe440a42..39155e1c 100644
}
GSettings*
@@ -1632,6 +1663,8 @@ spawn_result_cb (VteTerminal *terminal,
@@ -1650,6 +1681,8 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid;
@ -2055,7 +1761,7 @@ index fe440a42..39155e1c 100644
if (error) {
// FIXMEchpe should be unnecessary, vte already does this internally
vte_terminal_set_pty (terminal, nullptr);
@@ -1923,6 +1956,35 @@ terminal_screen_focus_in (GtkWidget *widget,
@@ -1941,6 +1974,35 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
}
@ -2091,7 +1797,7 @@ index fe440a42..39155e1c 100644
/**
* terminal_screen_get_current_dir:
* @screen:
@@ -1976,6 +2038,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1994,6 +2056,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1;
@ -2118,13 +1824,13 @@ index ded6b8ca..f4ec9047 100644
char *terminal_screen_get_current_dir (TerminalScreen *screen);
--
2.35.1
2.37.1
From c925a1a52ed345942b317b3ce3e61ae43d288b2b Mon Sep 17 00:00:00 2001
From 051746935290a1a0985b233b68072397761624bc Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 17:39:48 +0200
Subject: [PATCH 12/18] Revert "Remove the static title setting from profile
Subject: [PATCH 10/16] Revert "Remove the static title setting from profile
preferences"
This reverts commit e9cb8fea14a849704074c5d69f173bcf4dc2fb27.
@ -2237,10 +1943,10 @@ index 7f4a94c8..f86f8c98 100644
<object class="GtkGrid">
<property name="visible">True</property>
diff --git a/src/profile-editor.cc b/src/profile-editor.cc
index 3d50524d..1a4ab30d 100644
index d0e71e26..f7997fbf 100644
--- a/src/profile-editor.cc
+++ b/src/profile-editor.cc
@@ -1417,6 +1417,12 @@ profile_prefs_load (const char *uuid, GSettings *profile)
@@ -1416,6 +1416,12 @@ profile_prefs_load (const char *uuid, GSettings *profile)
(GSettingsBindSetMapping) enum_to_string,
terminal_preserve_working_directory_get_type, nullptr);
@ -2266,7 +1972,7 @@ index d2917fac..16e5c326 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.cc b/src/terminal-screen.cc
index 39155e1c..f95a545c 100644
index 4161debe..df36d254 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -1055,11 +1055,14 @@ char *
@ -2298,13 +2004,13 @@ index 39155e1c..f95a545c 100644
(!prop_name ||
prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
--
2.35.1
2.37.1
From d15ca046ffcf00a05966b833c5b321d235e50e25 Mon Sep 17 00:00:00 2001
From 1aabe8a7030d34486794f0871c361d657ceb0057 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 17:06:17 +0100
Subject: [PATCH 13/18] Restore translations for setting a title and
Subject: [PATCH 11/16] Restore translations for setting a title and
transparency
---
@ -2323,7 +2029,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/bs.po | 10 ++++++++++
po/ca.po | 12 ++++++++++++
po/ca@valencia.po | 12 ++++++++++++
po/cs.po | 11 +++++++++++
po/cs.po | 12 ++++++++++++
po/cy.po | 8 ++++----
po/da.po | 12 ++++++++++++
po/de.po | 12 ++++++++++++
@ -2351,7 +2057,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/id.po | 12 ++++++++++++
po/it.po | 12 ++++++++++++
po/ja.po | 12 ++++++++++++
po/ka.po | 6 +++---
po/ka.po | 5 +++++
po/kk.po | 12 ++++++++++++
po/km.po | 4 ++--
po/kn.po | 15 +++++++++------
@ -2400,7 +2106,7 @@ Subject: [PATCH 13/18] Restore translations for setting a title and
po/zh_CN.po | 15 +++++++++------
po/zh_HK.po | 15 +++++++++------
po/zh_TW.po | 15 +++++++++------
92 files changed, 734 insertions(+), 335 deletions(-)
92 files changed, 737 insertions(+), 332 deletions(-)
diff --git a/po/am.po b/po/am.po
index 3445d96d..ee992f07 100644
@ -2797,13 +2503,14 @@ index a6e8fb42..c9ed8508 100644
+msgid "Set Title"
+msgstr "Estableix el títol"
diff --git a/po/cs.po b/po/cs.po
index 5a4d02a4..6e46af21 100644
index 1beaf216..f27be077 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2378,3 +2378,14 @@ msgstr "_Zavřít okno"
@@ -2452,3 +2452,15 @@ msgstr "_Zavřít okno"
#, c-format
msgid "Failed to parse arguments: %s\n"
msgstr "Selhala analýza argumentů: %s\n"
+
+msgid "Transparent background"
+msgstr "Průsvitné pozadí"
+
@ -2862,10 +2569,10 @@ index 8ca75914..a27a354f 100644
+msgid "Transparent background"
+msgstr "Gennemsigtig baggrund"
diff --git a/po/de.po b/po/de.po
index 7bb9024d..86619d52 100644
index 8e6fa95a..98e7a8bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2572,3 +2572,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n"
@@ -2573,3 +2573,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n"
#~ msgid "_Quit"
#~ msgstr "_Beenden"
@ -3119,7 +2826,7 @@ index 4b1c2a7c..77076116 100644
+msgid "Transparent background"
+msgstr "Läbipaistev taust"
diff --git a/po/eu.po b/po/eu.po
index 528fc21d..2be39ac1 100644
index 6e014314..16f485b4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2362,3 +2362,15 @@ msgstr "Huts egin du argumentuak analizatzean: %s\n"
@ -3521,13 +3228,13 @@ index 868795ca..04459302 100644
+msgid "Set Title"
+msgstr "Atur Judul"
diff --git a/po/it.po b/po/it.po
index 3daa8263..94b0093c 100644
index afbebba8..afb09b0b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2468,3 +2468,15 @@ msgstr ""
#: src/terminal-window.c:3245
msgid "C_lose Window"
msgstr "Chiudi _finestra"
@@ -2485,3 +2485,15 @@ msgstr "Chiudi _finestra"
#, c-format
msgid "Failed to parse arguments: %s\n"
msgstr "Analisi degli argomenti non riuscita: %s\n"
+
+msgid "Transparent background"
+msgstr "Sfondo trasparente"
@ -3561,29 +3268,21 @@ index ab72bc42..690281a6 100644
+msgid "Set Title"
+msgstr "タイトルを設定する"
diff --git a/po/ka.po b/po/ka.po
index e0dd79f2..887d395c 100644
index c5855932..14356a48 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -219,8 +219,8 @@ msgid "<b>Background</b>"
msgstr "<b>ფონი</b>"
@@ -172,6 +172,11 @@ msgstr "პროფილის ადამიანისთვის-სა
msgid "Human-readable name of the profile."
msgstr "პროფილის ადამიანისთვის-სასიამოვნო წასაკითხი სახელი."
#: ../src/gnome-terminal.glade2.h:3
-msgid "<b>Command</b>"
-msgstr "<b>ბრძანება</b>"
+msgid "Command"
+msgstr "ბრძანება"
#: ../src/gnome-terminal.glade2.h:4
msgid "<b>Compatibility</b>"
@@ -569,7 +569,7 @@ msgstr "_ტექსტის ფერი:"
#: ../src/gnome-terminal.glade2.h:86
#, fuzzy
-msgid "_Transparent background"
+#: ../src/gnome-terminal.glade2.h:86
+#, fuzzy
+msgid "Transparent background"
msgstr "გამჭირვალე"
#: ../src/gnome-terminal.glade2.h:87
+msgstr "გამჭირვალე"
+
#: src/org.gnome.Terminal.gschema.xml:139
msgid "Default color of text in the terminal"
msgstr "ტერმინალის ტექსტის ნაგულისხმები ფერი"
diff --git a/po/kk.po b/po/kk.po
index 34ce6b2a..5d415eb3 100644
--- a/po/kk.po
@ -3971,10 +3670,10 @@ index 82f930b1..d52fbd94 100644
#: ../src/profile-preferences.glade.h:74
msgid "_Update login records when command is launched"
diff --git a/po/ne.po b/po/ne.po
index 901aa954..48b9b219 100644
index e30b1197..09a4b788 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -2769,8 +2769,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
@@ -2832,8 +2832,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n"
#~ msgid "_None (use solid color)"
#~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)"
@ -3985,7 +3684,7 @@ index 901aa954..48b9b219 100644
#~ msgid "_Use the system fixed width font"
#~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्"
@@ -3251,6 +3251,9 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
@@ -3425,6 +3425,9 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n"
#~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge."
#~ msgstr "तपाईँले क्लिक गरेको पाठ वैध OTP चुनौती नहुने देखिन्छ ।"
@ -3995,7 +3694,7 @@ index 901aa954..48b9b219 100644
#~ msgid "Switch to Tab 3"
#~ msgstr "ट्याब ३ मा स्विच गर्नुहोस्"
@@ -3388,8 +3391,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
@@ -3564,8 +3567,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n"
#~ msgid "_Input Methods"
#~ msgstr "आगत विधि"
@ -4756,7 +4455,7 @@ index 63263749..496da331 100644
#~ msgid ""
#~ "You already have a profile called “%s”. Do you want to create another "
diff --git a/po/tr.po b/po/tr.po
index e5bb0082..851e7f97 100644
index 7732939b..25605459 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2759,3 +2759,15 @@ msgstr "Bağımsız değişkenler ayrıştırılamadı: %s\n"
@ -5037,13 +4736,13 @@ index 80cb2343..20e2a93c 100644
+msgid "Transparent background"
+msgstr "透明背景"
--
2.35.1
2.37.1
From 6cce8c2a6344c4eda524727f72b958a2a8e2e0fb Mon Sep 17 00:00:00 2001
From 8c53962c85817842b8475d74c6f59c56331fc05a Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 25 May 2016 13:47:36 +0200
Subject: [PATCH 14/18] Restore the action and shortcut to set a static title
Subject: [PATCH 12/16] Restore the action and shortcut to set a static title
from the menus
This reverts 9bbe19e98f62aa3c9020913a3a5a8080a5177505 with various
@ -5186,13 +4885,13 @@ index be8533e6..b46cd89b 100644
{ "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr },
{ "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr },
--
2.35.1
2.37.1
From 0f60451b48cd76511e32703383be5854100dc014 Mon Sep 17 00:00:00 2001
From f8163016f381f2b55ac14362bc3accbfd12d0628 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 18:14:36 +0200
Subject: [PATCH 15/18] screen: Style fix
Subject: [PATCH 13/16] screen: Style fix
This brings the code in line with how it was before
de0dc7c2649c42e2aa02a66e4be27d262b34452d
@ -5203,7 +4902,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index f95a545c..815aff77 100644
index df36d254..e1a18266 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -815,7 +815,7 @@ terminal_screen_new (GSettings *profile,
@ -5216,13 +4915,13 @@ index f95a545c..815aff77 100644
const char *p;
--
2.35.1
2.37.1
From 9a717c25e907dbd24f9044cb77e6c5cb92142f92 Mon Sep 17 00:00:00 2001
From d78de24d3509b075e4955515c9f5953a240ea036 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 30 Jun 2016 16:58:15 +0200
Subject: [PATCH 16/18] Restore the rest of the title handling options and make
Subject: [PATCH 14/16] Restore the rest of the title handling options and make
it all work
This reverts commit f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8 and makes
@ -5322,10 +5021,10 @@ index f86f8c98..c45366ae 100644
</child>
</object>
diff --git a/src/profile-editor.cc b/src/profile-editor.cc
index 1a4ab30d..9488480e 100644
index f7997fbf..2f756fa3 100644
--- a/src/profile-editor.cc
+++ b/src/profile-editor.cc
@@ -1423,6 +1423,16 @@ profile_prefs_load (const char *uuid, GSettings *profile)
@@ -1422,6 +1422,16 @@ profile_prefs_load (const char *uuid, GSettings *profile)
"text",
GSettingsBindFlags(G_SETTINGS_BIND_GET |
G_SETTINGS_BIND_SET));
@ -5374,7 +5073,7 @@ index 16e5c326..bb3048fa 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.cc b/src/terminal-screen.cc
index 815aff77..f0111829 100644
index e1a18266..7203fb89 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -111,8 +111,11 @@ struct _TerminalScreenPrivate
@ -5670,7 +5369,7 @@ index 815aff77..f0111829 100644
}
GSettings*
@@ -1672,8 +1763,6 @@ spawn_result_cb (VteTerminal *terminal,
@@ -1690,8 +1781,6 @@ spawn_result_cb (VteTerminal *terminal,
priv->child_pid = pid;
@ -5679,7 +5378,7 @@ index 815aff77..f0111829 100644
if (error) {
// FIXMEchpe should be unnecessary, vte already does this internally
vte_terminal_set_pty (terminal, nullptr);
@@ -1965,33 +2054,45 @@ terminal_screen_focus_in (GtkWidget *widget,
@@ -1983,33 +2072,45 @@ terminal_screen_focus_in (GtkWidget *widget,
return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
}
@ -5739,7 +5438,7 @@ index 815aff77..f0111829 100644
}
/**
@@ -2024,7 +2125,9 @@ static void
@@ -2042,7 +2143,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen)
{
@ -5750,7 +5449,7 @@ index 815aff77..f0111829 100644
}
static void
@@ -2047,8 +2150,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -2065,8 +2168,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
priv->child_pid = -1;
@ -5759,7 +5458,7 @@ index 815aff77..f0111829 100644
action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY));
switch (action)
@@ -2092,6 +2193,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -2110,6 +2211,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
}
}
@ -5835,13 +5534,13 @@ index b46cd89b..662f8c79 100644
static void
--
2.35.1
2.37.1
From 87ef0c3c562f9ab132de300f697bd57067f6794f Mon Sep 17 00:00:00 2001
From 2d5ebcf4b3aa34cf06d90548656c5ecbf805158e Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 3 Apr 2019 15:38:09 +0200
Subject: [PATCH 17/18] Update the title with the current foreground process
Subject: [PATCH 15/16] Update the title with the current foreground process
Some changes by:
Bill Nottingham <notting@splat.cc>
@ -5883,7 +5582,7 @@ index bb3048fa..d5ee2a88 100644
#define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode"
#define TERMINAL_PROFILE_TITLE_KEY "title"
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index f0111829..4dd9a183 100644
index 7203fb89..d7b29a46 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -110,7 +110,9 @@ struct _TerminalScreenPrivate
@ -5964,7 +5663,7 @@ index f0111829..4dd9a183 100644
g_object_thaw_notify (object);
}
@@ -2125,6 +2158,9 @@ static void
@@ -2143,6 +2176,9 @@ static void
terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen)
{
@ -5974,7 +5673,7 @@ index f0111829..4dd9a183 100644
terminal_screen_set_dynamic_title (screen,
vte_terminal_get_window_title (vte_terminal),
FALSE);
@@ -2232,6 +2268,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
@@ -2250,6 +2286,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
cmdline = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
@ -5983,7 +5682,7 @@ index f0111829..4dd9a183 100644
out:
priv->contents_changed_source_id = 0;
return G_SOURCE_REMOVE;
@@ -2324,6 +2362,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -2342,6 +2380,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n");
@ -5991,7 +5690,7 @@ index f0111829..4dd9a183 100644
priv->between_preexec_and_precmd = FALSE;
if (priv->contents_changed_source_id != 0)
@@ -2343,6 +2382,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
@@ -2361,6 +2400,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
g_clear_pointer (&priv->current_cmdline, g_free);
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n");
@ -6000,7 +5699,7 @@ index f0111829..4dd9a183 100644
}
static gboolean
@@ -2364,6 +2405,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
@@ -2382,6 +2423,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
cmdline = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
@ -6010,13 +5709,13 @@ index f0111829..4dd9a183 100644
retval = G_SOURCE_REMOVE;
--
2.35.1
2.37.1
From 7da88b7f28bddf57194b38c6277366845eb6e5bf Mon Sep 17 00:00:00 2001
From 6fc30d72715fbfae6f3499f64abee9c2d634e0b3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 27 Feb 2020 19:32:08 +0100
Subject: [PATCH 18/18] screen, window: Preserve current toolbox, if any
Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any
This relies on toolbox(1) emitting a terminal escape sequence that
advertises the name of the current toolbox container.
@ -6029,7 +5728,7 @@ https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 4dd9a183..6295eaae 100644
index d7b29a46..a3c30644 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -858,6 +858,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
@ -6135,5 +5834,5 @@ index 662f8c79..1569bf1e 100644
if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW)
gtk_window_present (GTK_WINDOW (window));
--
2.35.1
2.37.1

15
gnome-terminal.spec
View File

@ -7,22 +7,24 @@
%define desktop_file_utils_version 0.2.90
Name: gnome-terminal
Version: 3.44.1
Release: 2%{?dist}
Version: 3.45.90
Release: 1%{?dist}
Summary: Terminal emulator for GNOME
License: GPLv3+ and GFDL and LGPLv2+
URL: https://wiki.gnome.org/Apps/Terminal
Source0: https://download.gnome.org/sources/%{name}/3.44/%{name}-%{version}.tar.xz
Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
Source1: org.gnome.Terminal.gschema.override
Patch0: gnome-terminal-cntr-ntfy-autottl-ts.patch
Patch1: gnome-terminal-3.45.90-nautilus-extension.patch
Patch2: gnome-terminal-3.45.90-xml-namespaces.patch
BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(libnautilus-extension)
BuildRequires: pkgconfig(libnautilus-extension-4)
BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(vte-2.91) >= %{vte_version}
@ -102,10 +104,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de
%{_userunitdir}/gnome-terminal-server.service
%files nautilus
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%{_libdir}/nautilus/extensions-4/libterminal-nautilus.so
%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml
%changelog
* Wed Aug 17 2022 David King <amigadave@amigadave.com> - 3.45.90-1
- Update to 3.45.90
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.44.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-terminal-3.44.1.tar.xz) = afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
SHA512 (gnome-terminal-3.45.90.tar.bz2) = 941be0bac2f440c01bfb1482b30964ce1300aad8e1f95eacc8f1beccc26bc521a96267d118b176686eca2317edb8517f30a348d4df81d09bed1a44fa9b46745a