upstream update

6 files changed, 26 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c11438e4bbd5..ed489c0358a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-terminal-transparency
 	pkgdesc = The GNOME Terminal Emulator with background transparency
-	pkgver = 3.38.1
-	pkgrel = 2
+	pkgver = 3.38.2
+	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Terminal
 	changelog = package.changelog
 	arch = x86_64
@@ -16,18 +16,18 @@ pkgbase = gnome-terminal-transparency
 	makedepends = yelp-tools
 	depends = vte3>=0.62.1
 	depends = gsettings-desktop-schemas
-	provides = gnome-terminal=3.38.1
+	provides = gnome-terminal=3.38.2
 	conflicts = gnome-terminal
-	source = https://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-3.38.1.tar.xz
+	source = https://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-3.38.2.tar.xz
 	source = transparency.patch
 	source = 0001-screen-Manually-handle-env-inheritance.patch
 	source = 0002-screen-Move-env-sanitization-from-client.patch
 	source = 0003-screen-Ignore-some-more-environment-variables.patch
-	sha256sums = d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1
+	sha256sums = 27bddc9d0ba614c86e5ecb4f54c75ebc3415e2887acd91442057548fd3206618
 	sha256sums = 106d36537c621d1b0d4a9a541ee307ace593e005c322fd3622fc64c2f54f70ba
-	sha256sums = 9517a7be3c8debdd7c57390e3c62eb8395daf9b9949614023e385cc8cd91b1e4
-	sha256sums = c48fe6060b852e136fee7b94b42fce5c8b9ac201720083d0b3edfc22cacdd285
-	sha256sums = dc80adeee3d1106d6e814c2799a58e1bf4900c967aa7b3ca603f393b5abfcde7
+	sha256sums = c350db9831c3bbe5c28ab5f959076cbeacc1b2bac12ca37623db2bf7d9461ecf
+	sha256sums = 4dc0260da875d22830440c3295aef2c73a1625eeeadf94747ac22920d0ddcdca
+	sha256sums = abc5e7b30979a12dc6790d17efc47ec4a112fa6e3e3555ff16c0769b0178c599
 
 pkgname = gnome-terminal-transparency
 
diff --git a/0001-screen-Manually-handle-env-inheritance.patch b/0001-screen-Manually-handle-env-inheritance.patch
index 2443571f5aaa..35eec5b018c2 100644
--- a/0001-screen-Manually-handle-env-inheritance.patch
+++ b/0001-screen-Manually-handle-env-inheritance.patch
@@ -12,10 +12,10 @@ https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/303
  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 @@ index 844b563c..2442a49d 100644
    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;
diff --git a/0002-screen-Move-env-sanitization-from-client.patch b/0002-screen-Move-env-sanitization-from-client.patch
index 778b4c71a0e3..a7cb29178551 100644
--- a/0002-screen-Move-env-sanitization-from-client.patch
+++ b/0002-screen-Move-env-sanitization-from-client.patch
@@ -55,10 +55,10 @@ index f7fb6a81..774e5f50 100644
      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 @@ index 2442a49d..8abc59fd 100644
  
    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);
      }
  
diff --git a/0003-screen-Ignore-some-more-environment-variables.patch b/0003-screen-Ignore-some-more-environment-variables.patch
index 8b0deabebfc1..8f0295123df3 100644
--- a/0003-screen-Ignore-some-more-environment-variables.patch
+++ b/0003-screen-Ignore-some-more-environment-variables.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] screen: Ignore some more environment variables
  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");
diff --git a/PKGBUILD b/PKGBUILD
index 5a561a4de4c0..ff4990fa91be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
 
 pkgname=gnome-terminal-transparency
 _pkgname=gnome-terminal
-pkgver=3.38.1
-pkgrel=2
+pkgver=3.38.2
+pkgrel=1
 pkgdesc="The GNOME Terminal Emulator with background transparency"
 url="https://wiki.gnome.org/Apps/Terminal"
 arch=(x86_64)
@@ -27,11 +27,11 @@ source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pk
         0001-screen-Manually-handle-env-inheritance.patch
         0002-screen-Move-env-sanitization-from-client.patch
         0003-screen-Ignore-some-more-environment-variables.patch)
-sha256sums=('d998d4824f38847fdd74bad6b5f09cc8e11b9de8e2a284a439af290714ddf3d1'
+sha256sums=('27bddc9d0ba614c86e5ecb4f54c75ebc3415e2887acd91442057548fd3206618'
             '106d36537c621d1b0d4a9a541ee307ace593e005c322fd3622fc64c2f54f70ba'
-            '9517a7be3c8debdd7c57390e3c62eb8395daf9b9949614023e385cc8cd91b1e4'
-            'c48fe6060b852e136fee7b94b42fce5c8b9ac201720083d0b3edfc22cacdd285'
-            'dc80adeee3d1106d6e814c2799a58e1bf4900c967aa7b3ca603f393b5abfcde7')
+            'c350db9831c3bbe5c28ab5f959076cbeacc1b2bac12ca37623db2bf7d9461ecf'
+            '4dc0260da875d22830440c3295aef2c73a1625eeeadf94747ac22920d0ddcdca'
+            'abc5e7b30979a12dc6790d17efc47ec4a112fa6e3e3555ff16c0769b0178c599')
 
 prepare() {
   cd $_pkgname-$pkgver
diff --git a/package.changelog b/package.changelog
index 7a2a0a26f69f..cb3b481ee99c 100644
--- a/package.changelog
+++ b/package.changelog
@@ -1,3 +1,6 @@
+2021-01-10
+	upstream update: 3.38.1 -> 3.38.2
+
 2020-10-29
 	add patches "environment fixes"
 	change description