[arch-commits] Commit in gnome-terminal/trunk (4 files)

[Jan Steffens]

    Date: Saturday, January 9, 2021 @ 19:49:34
  Author: heftig
Revision: 405890

3.38.2-1

Modified:
  gnome-terminal/trunk/0001-screen-Manually-handle-env-inheritance.patch
  gnome-terminal/trunk/0002-screen-Move-env-sanitization-from-client.patch
  gnome-terminal/trunk/0003-screen-Ignore-some-more-environment-variables.patch
  gnome-terminal/trunk/PKGBUILD

----------------------------------------------------------+
 0001-screen-Manually-handle-env-inheritance.patch        |    8 ++++----
 0002-screen-Move-env-sanitization-from-client.patch      |    6 +++---
 0003-screen-Ignore-some-more-environment-variables.patch |    4 ++--
 PKGBUILD                                                 |   12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

Modified: 0001-screen-Manually-handle-env-inheritance.patch
===================================================================
--- 0001-screen-Manually-handle-env-inheritance.patch	2021-01-09 19:47:57 UTC (rev 405889)
+++ 0001-screen-Manually-handle-env-inheritance.patch	2021-01-09 19:49:34 UTC (rev 405890)
@@ -12,10 +12,10 @@
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 844b563c..2442a49d 100644
+index f44de43a..570d4151 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -942,9 +942,7 @@ terminal_screen_exec (TerminalScreen *screen,
+@@ -943,9 +943,7 @@ terminal_screen_exec (TerminalScreen *screen,
                                                                    &shell);
  
    gboolean preserve_cwd = FALSE;
@@ -26,11 +26,11 @@
    gs_strfreev char **exec_argv = NULL;
    if (!terminal_screen_get_child_command (screen,
                                            argv,
-@@ -1431,25 +1429,27 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
+@@ -1432,25 +1430,27 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
  {
    TerminalApp *app = terminal_app_get ();
    char **env;
-+  gs_strfreev **current_environ = NULL;
++  gs_strfreev char **current_environ = NULL;
    char *e, *v;
    GHashTable *env_table;
    GHashTableIter iter;

Modified: 0002-screen-Move-env-sanitization-from-client.patch
===================================================================
--- 0002-screen-Move-env-sanitization-from-client.patch	2021-01-09 19:47:57 UTC (rev 405889)
+++ 0002-screen-Move-env-sanitization-from-client.patch	2021-01-09 19:49:34 UTC (rev 405890)
@@ -55,10 +55,10 @@
      g_variant_builder_add (builder, "{sv}",
                             "environ",
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 2442a49d..8abc59fd 100644
+index 570d4151..1e95d41b 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -959,10 +959,8 @@ terminal_screen_exec (TerminalScreen *screen,
+@@ -960,10 +960,8 @@ terminal_screen_exec (TerminalScreen *screen,
      return FALSE;
    }
  
@@ -70,7 +70,7 @@
  
    data->fd_list = fd_list ? g_object_ref(fd_list) : NULL;
  
-@@ -1452,9 +1450,33 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
+@@ -1453,9 +1451,33 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
            g_hash_table_replace (env_table, g_strdup (env[i]), NULL);
      }
  

Modified: 0003-screen-Ignore-some-more-environment-variables.patch
===================================================================
--- 0003-screen-Ignore-some-more-environment-variables.patch	2021-01-09 19:47:57 UTC (rev 405889)
+++ 0003-screen-Ignore-some-more-environment-variables.patch	2021-01-09 19:49:34 UTC (rev 405890)
@@ -10,10 +10,10 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 8abc59fd..6e8c590d 100644
+index 1e95d41b..137faaa1 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -1457,7 +1457,10 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
+@@ -1458,7 +1458,10 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
    g_hash_table_remove (env_table, "EXIT_STATUS");
    g_hash_table_remove (env_table, "GIO_LAUNCHED_DESKTOP_FILE");
    g_hash_table_remove (env_table, "GIO_LAUNCHED_DESKTOP_FILE_PID");

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-09 19:47:57 UTC (rev 405889)
+++ PKGBUILD	2021-01-09 19:49:34 UTC (rev 405890)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.38.1
-pkgrel=2
+pkgver=3.38.2
+pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 url="https://wiki.gnome.org/Apps/Terminal"
 arch=(x86_64)
@@ -12,15 +12,15 @@
 makedepends=(itstool docbook-xsl libnautilus-extension appstream-glib
              gnome-shell vala yelp-tools git)
 groups=(gnome)
-_commit=71b414832b1bf02f748048c59c31de7761181d44  # tags/3.38.1^0
+_commit=8682ee73244a9ad92d19cd3b52cb04a0155d4282  # tags/3.38.2^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-terminal.git#commit=$_commit"
         0001-screen-Manually-handle-env-inheritance.patch
         0002-screen-Move-env-sanitization-from-client.patch
         0003-screen-Ignore-some-more-environment-variables.patch)
 sha256sums=('SKIP'
-            '9517a7be3c8debdd7c57390e3c62eb8395daf9b9949614023e385cc8cd91b1e4'
-            'c48fe6060b852e136fee7b94b42fce5c8b9ac201720083d0b3edfc22cacdd285'
-            'dc80adeee3d1106d6e814c2799a58e1bf4900c967aa7b3ca603f393b5abfcde7')
+            'c350db9831c3bbe5c28ab5f959076cbeacc1b2bac12ca37623db2bf7d9461ecf'
+            '4dc0260da875d22830440c3295aef2c73a1625eeeadf94747ac22920d0ddcdca'
+            'abc5e7b30979a12dc6790d17efc47ec4a112fa6e3e3555ff16c0769b0178c599')
 
 pkgver() {
   cd $pkgname