diffstat for gnome-terminal-3.56.1 gnome-terminal-3.56.2

 ChangeLog                               |   19 ++++++++++++-------
 debian/.gitignore                       |    1 +
 debian/changelog                        |   24 ++++++++++++++++++++++++
 debian/patches/prefs-Replace-icon.patch |   26 ++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 meson.build                             |    2 +-
 src/terminal-options.cc                 |    1 +
 src/terminal-options.hh                 |    2 --
 src/terminal-prefs.cc                   |    2 +-
 subprojects/vte/meson.build             |    2 +-
 subprojects/vte/src/vteseq.cc           |    2 +-
 11 files changed, 69 insertions(+), 13 deletions(-)

diff -Nru gnome-terminal-3.56.1/ChangeLog gnome-terminal-3.56.2/ChangeLog
--- gnome-terminal-3.56.1/ChangeLog	2025-04-12 22:44:49.635889300 +0100
+++ gnome-terminal-3.56.2/ChangeLog	2025-05-24 20:12:16.107137000 +0100
@@ -1,8 +1,13 @@
-commit e0e5623d52555491da2227949978c5326e947a37
-Author: Hugo Carvalho <hugokarvalho@hotmail.com>
-Date:   Sat Mar 29 15:21:05 2025 +0000
+commit 941d51d151c0e25b285ffe98ad4a38b4ce5dda69
+Author: Christian Persch <chpe@src.gnome.org>
+Date:   Sat May 3 12:30:36 2025 +0200
 
-    Update Portuguese translation
+    client: legacy: Initialise --wait to false
+    
+    Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8122
+    (cherry picked from commit 3056b8e862c07f2fb2b02e3e634e153449cb3f76)
+    (cherry picked from commit 1a26d534e214dff9c66644d695128e0f3e5f9371)
+    (cherry picked from commit 98b798d25ac23a200ffba6377dd0d49a38788fa7)
 
  .dir-locals.el                                     |   15 +
  .gitlab-ci.yml                                     |   81 +
@@ -255,8 +260,8 @@
  src/terminal-notebook-menu.ui                      |   49 +
  src/terminal-notebook.cc                           |  596 ++
  src/terminal-notebook.hh                           |   62 +
- src/terminal-options.cc                            | 1759 ++++++
- src/terminal-options.hh                            |  196 +
+ src/terminal-options.cc                            | 1760 ++++++
+ src/terminal-options.hh                            |  194 +
  src/terminal-pcre2.hh                              |   25 +
  src/terminal-prefs-process.cc                      |  513 ++
  src/terminal-prefs-process.hh                      |   53 +
@@ -298,4 +303,4 @@
  src/terminal.common.css                            |   22 +
  src/terminal.gresource.xml                         |   30 +
  subprojects/vte.wrap                               |   23 +
- 294 files changed, 407382 insertions(+)
+ 294 files changed, 407381 insertions(+)
diff -Nru gnome-terminal-3.56.1/debian/changelog gnome-terminal-3.56.2/debian/changelog
--- gnome-terminal-3.56.1/debian/changelog	2025-04-17 15:23:18.000000000 +0100
+++ gnome-terminal-3.56.2/debian/changelog	2025-07-15 20:51:26.000000000 +0100
@@ -1,3 +1,27 @@
+gnome-terminal (3.56.2-2) unstable; urgency=medium
+
+  * Team upload
+  * d/p/prefs-Replace-icon.patch:
+    Add patch from upstream to avoid a using legacy icon name.
+    emblem-default-symbolic is no longer in adwaita-icon-theme, only in
+    adwaita-icon-theme-legacy, which we intentionally don't install by
+    default. Use a similar-looking icon instead. (Closes: #1109086)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 15 Jul 2025 20:51:26 +0100
+
+gnome-terminal (3.56.2-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream bugfix release
+    - Fix an uninitialized variable that caused intermittent
+      "Failed to parse arguments: Can only use --wait once" errors
+      (gnome-terminal#8122 upstream)
+    - Remove an unused struct field
+    - Updates to bundled vte subproject
+      (not used in Debian, we use the vte2.91 package instead)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 14 Jul 2025 10:57:25 +0100
+
 gnome-terminal (3.56.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru gnome-terminal-3.56.1/debian/.gitignore gnome-terminal-3.56.2/debian/.gitignore
--- gnome-terminal-3.56.1/debian/.gitignore	1970-01-01 01:00:00.000000000 +0100
+++ gnome-terminal-3.56.2/debian/.gitignore	2025-07-15 20:51:26.000000000 +0100
@@ -0,0 +1 @@
+/gnome-terminal.wrapper.1
diff -Nru gnome-terminal-3.56.1/debian/patches/prefs-Replace-icon.patch gnome-terminal-3.56.2/debian/patches/prefs-Replace-icon.patch
--- gnome-terminal-3.56.1/debian/patches/prefs-Replace-icon.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-terminal-3.56.2/debian/patches/prefs-Replace-icon.patch	2025-07-15 20:51:26.000000000 +0100
@@ -0,0 +1,26 @@
+From: Christian Persch <chpe@src.gnome.org>
+Date: Tue, 15 Jul 2025 21:37:36 +0200
+Subject: prefs: Replace icon
+
+The emblem icons were removed from adwaita, so use something else.
+
+Origin: upstream, 3.56.3, commit:b73d031aba8c42a0d972f941d9b450d090ea484c
+Bug: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8126
+Bug-Debian: https://bugs.debian.org/1109086
+---
+ src/terminal-prefs.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/terminal-prefs.cc b/src/terminal-prefs.cc
+index 437c58a..a100e46 100644
+--- a/src/terminal-prefs.cc
++++ b/src/terminal-prefs.cc
+@@ -487,7 +487,7 @@ listbox_create_row (const char *name,
+ 
+   GtkStack *home_stack = GTK_STACK (gtk_stack_new ());
+   gtk_widget_set_margin_start (GTK_WIDGET (home_stack), 12);
+-  GtkImage *home_image = GTK_IMAGE (gtk_image_new_from_icon_name ("emblem-default-symbolic", GTK_ICON_SIZE_BUTTON));
++  GtkImage *home_image = GTK_IMAGE (gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_BUTTON));
+   gtk_widget_set_tooltip_text (GTK_WIDGET (home_image), _("This is the default profile"));
+   gtk_stack_add_named (home_stack, GTK_WIDGET (home_image), "home");
+   GtkLabel *home_label = GTK_LABEL (gtk_label_new (""));
diff -Nru gnome-terminal-3.56.1/debian/patches/series gnome-terminal-3.56.2/debian/patches/series
--- gnome-terminal-3.56.1/debian/patches/series	2025-04-17 15:23:18.000000000 +0100
+++ gnome-terminal-3.56.2/debian/patches/series	2025-07-15 20:51:26.000000000 +0100
@@ -1,2 +1,3 @@
 01_onlyshowin.patch
 Provide-fallback-for-reading-current-directory-if-OS.patch
+prefs-Replace-icon.patch
diff -Nru gnome-terminal-3.56.1/meson.build gnome-terminal-3.56.2/meson.build
--- gnome-terminal-3.56.1/meson.build	2025-03-29 15:21:05.000000000 +0000
+++ gnome-terminal-3.56.2/meson.build	2025-05-03 11:32:45.000000000 +0100
@@ -27,7 +27,7 @@
     'GFDL-1.3-only',                # the appstream data
   ],
   meson_version: '>= 0.62.0',
-  version: '3.56.1',
+  version: '3.56.2',
 )
 
 # Naming
diff -Nru gnome-terminal-3.56.1/src/terminal-options.cc gnome-terminal-3.56.2/src/terminal-options.cc
--- gnome-terminal-3.56.1/src/terminal-options.cc	2025-03-29 15:21:05.000000000 +0000
+++ gnome-terminal-3.56.2/src/terminal-options.cc	2025-05-03 11:32:45.000000000 +0100
@@ -199,6 +199,7 @@
   it->active = FALSE;
   it->fd_list = nullptr;
   it->fd_array = nullptr;
+  it->wait = false;
 
   return it;
 }
diff -Nru gnome-terminal-3.56.1/src/terminal-options.hh gnome-terminal-3.56.2/src/terminal-options.hh
--- gnome-terminal-3.56.1/src/terminal-options.hh	2025-03-29 15:21:05.000000000 +0000
+++ gnome-terminal-3.56.2/src/terminal-options.hh	2025-05-03 11:32:45.000000000 +0100
@@ -89,7 +89,6 @@
   char    *default_title;
   char   **exec_argv;
   char    *default_profile;
-  gboolean default_profile_is_id;
   gboolean no_environment;
 
   gboolean  execute;
@@ -106,7 +105,6 @@
 typedef struct
 {
   char *profile;
-  gboolean profile_is_id;
   char **exec_argv;
   char *title;
   char *working_dir;
diff -Nru gnome-terminal-3.56.1/src/terminal-prefs.cc gnome-terminal-3.56.2/src/terminal-prefs.cc
--- gnome-terminal-3.56.1/src/terminal-prefs.cc	2025-03-29 15:21:05.000000000 +0000
+++ gnome-terminal-3.56.2/src/terminal-prefs.cc	2025-07-16 10:09:15.000000000 +0100
@@ -487,7 +487,7 @@
 
   GtkStack *home_stack = GTK_STACK (gtk_stack_new ());
   gtk_widget_set_margin_start (GTK_WIDGET (home_stack), 12);
-  GtkImage *home_image = GTK_IMAGE (gtk_image_new_from_icon_name ("emblem-default-symbolic", GTK_ICON_SIZE_BUTTON));
+  GtkImage *home_image = GTK_IMAGE (gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_BUTTON));
   gtk_widget_set_tooltip_text (GTK_WIDGET (home_image), _("This is the default profile"));
   gtk_stack_add_named (home_stack, GTK_WIDGET (home_image), "home");
   GtkLabel *home_label = GTK_LABEL (gtk_label_new (""));
diff -Nru gnome-terminal-3.56.1/subprojects/vte/meson.build gnome-terminal-3.56.2/subprojects/vte/meson.build
--- gnome-terminal-3.56.1/subprojects/vte/meson.build	2025-04-12 22:43:01.000000000 +0100
+++ gnome-terminal-3.56.2/subprojects/vte/meson.build	2025-05-24 20:09:03.000000000 +0100
@@ -17,7 +17,7 @@
 project(
   'vte',
   ['c', 'cpp'],
-  version: '0.80.2',
+  version: '0.80.3',
   license: ['LGPL-3.0-or-later', 'GPL-3.0-or-later'],
   default_options: [
     'buildtype=release',
diff -Nru gnome-terminal-3.56.1/subprojects/vte/src/vteseq.cc gnome-terminal-3.56.2/subprojects/vte/src/vteseq.cc
--- gnome-terminal-3.56.1/subprojects/vte/src/vteseq.cc	2025-04-12 22:43:01.000000000 +0100
+++ gnome-terminal-3.56.2/subprojects/vte/src/vteseq.cc	2025-05-24 20:09:03.000000000 +0100
@@ -7663,7 +7663,7 @@
                 break;
 
         case VTE_OSC_XTERM_RESET_COLOR_TEXT_BG:
-                reset_color(ColorPaletteIndex::default_fg(), ColorSource::Escape);
+                reset_color(ColorPaletteIndex::default_bg(), ColorSource::Escape);
                 break;
 
         case VTE_OSC_XTERM_RESET_COLOR_CURSOR_BG:
