Accepting request 1040318 from GNOME:Factory

- Update to version 3.46.7:
  * nautilus: Fix macro redefinition warning
  * screen: Add some missing casts
  * build: Add define for openbsd
  * Updated translations.

- Update to version 3.46.6:
  * prefs: Sink a floating variant
  * prefs: Use default timeout when debugging
  * prefs: Reduce default bus timeout
  * prefs: Fix serialisation format
  * client: Improve env var filters

- Update to version 3.46.5:
  * util: Fix interpretation of TryExec desktop entry key
- Drop f06e6e5.patch: fixed upstream. (forwarded request 1040244 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1040318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-terminal?expand=0&rev=148

_service

@@ -5,7 +5,7 @@
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">refs/tags/3.46.4</param>
+    <param name="revision">refs/tags/3.46.7</param>
   </service>
   <service name="tar" mode="buildtime" />
   <service name="recompress" mode="buildtime">

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://gitlab.gnome.org/GNOME/gnome-terminal.git</param>
-              <param name="changesrevision">44d55c8626d609d61905ef5cf11f0af2d7b7acd4</param></service></servicedata>
+              <param name="changesrevision">816edf80cd7bf7f253366099ea9fcaf361676139</param></service></servicedata>

f06e6e5.patch

@@ -1,79 +0,0 @@
-From f06e6e5821a1a718431d25ccd8d08225ba66dd58 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Sun, 6 Nov 2022 15:58:05 +0100
-Subject: [PATCH] util: Fix interpretation of TryExec desktop entry key
-
-The TryExec key is optional, so only evalute it if it is present.
-Also, it may contain an abolute path, in which case we skip searching
-the PATH for the executable.
-
-Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7944
-(cherry picked from commit 78971c71992e7dcf021743dc8873a2088245335c)
----
- src/terminal-util.cc | 39 +++++++++++++++++++++++++++------------
- 1 file changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/src/terminal-util.cc b/src/terminal-util.cc
-index fcdd939a..3ee8f51b 100644
---- a/src/terminal-util.cc
-+++ b/src/terminal-util.cc
-@@ -1626,29 +1626,44 @@ xte_data_check_one(char const* file,
-     return false;
-   }
- 
--  // As per the XDG desktop entry spec, the TryExec key contains the name
--  // of an executable that can be used to determine if the programme is
--  // actually present.
-+  // As per the XDG desktop entry spec, the (optional) TryExec key contains
-+  // the name of an executable that can be used to determine if the programme
-+  // is actually present.
-   gs_free auto try_exec = g_key_file_get_string(kf,
-                                                 G_KEY_FILE_DESKTOP_GROUP,
-                                                 G_KEY_FILE_DESKTOP_KEY_TRY_EXEC,
-                                                 nullptr);
--  if (!try_exec) {
-+  if (try_exec && try_exec[0]) {
-     _terminal_debug_print(TERMINAL_DEBUG_DEFAULT,
-                           "Desktop file \"%s\" has no TryExec field.\n",
-                           file);
- 
--    return false;
--  }
-+    // TryExec may be an abolute path, or be searched in $PATH
-+    gs_free char* exec_path = nullptr;
-+    if (g_path_is_absolute(try_exec))
-+      exec_path = g_strdup(try_exec);
-+    else
-+      exec_path = g_find_program_in_path(try_exec);
- 
--  gs_free auto exec_path = g_find_program_in_path(try_exec);
--  auto const exists = exec_path != nullptr;
-+    auto const exists = exec_path != nullptr &&
-+      g_file_test(exec_path, GFileTest(G_FILE_TEST_IS_EXECUTABLE));
- 
--  _terminal_debug_print(TERMINAL_DEBUG_DEFAULT,
--                        "Desktop file \"%s\" is %sinstalled.\n",
--                        file, exists ? "" : "not ");
-+    _terminal_debug_print(TERMINAL_DEBUG_DEFAULT,
-+                          "Desktop file \"%s\" is %sinstalled (TryExec).\n",
-+                          file, exists ? "" : "not ");
-+
-+    if (!exists)
-+      return false;
-+  } else {
-+    // TryExec is not present. We could fall back to parsing the Exec
-+    // key and look if its first argument points to an executable that
-+    // exists on the system, but that may also fail if the desktop file
-+    // is DBusActivatable=true in which case we would need to find
-+    // out if the D-Bus service corresponding to the name of the desktop
-+    // file (without the .desktop extension) is activatable.
-+  }
- 
--  return exists;
-+  return true;
- }
- 
- static bool
--- 
-GitLab
-

gnome-terminal-3.46.4.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43895d4a1dea5777c8e117992e6be9ba2d166b6f0a30619c76174baa56631b57
-size 13939725

gnome-terminal-3.46.7.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d23c86f0334ea57a0baf9b14a1a13669cdd0237f2fa9145cafca825cf850918f
+size 13934605

gnome-terminal.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Dec 05 11:50:19 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 3.46.7:
+  * nautilus: Fix macro redefinition warning
+  * screen: Add some missing casts
+  * build: Add define for openbsd
+  * Updated translations.
+
+-------------------------------------------------------------------
+Mon Dec 05 11:49:59 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 3.46.6:
+  * prefs: Sink a floating variant
+  * prefs: Use default timeout when debugging
+  * prefs: Reduce default bus timeout
+  * prefs: Fix serialisation format
+  * client: Improve env var filters
+
+-------------------------------------------------------------------
+Mon Dec 05 11:49:36 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 3.46.5:
+  * util: Fix interpretation of TryExec desktop entry key
+- Drop f06e6e5.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Nov 07 20:02:37 UTC 2022 - bjorn.lie@gmail.com
 

gnome-terminal.obsinfo

@@ -1,4 +1,4 @@
 name: gnome-terminal
-version: 3.46.4
+version: 3.46.7
-mtime: 1667331403
+mtime: 1670015214
-commit: 44d55c8626d609d61905ef5cf11f0af2d7b7acd4
+commit: 816edf80cd7bf7f253366099ea9fcaf361676139

gnome-terminal.spec

@@ -18,15 +18,13 @@
 
 %bcond_without  nautilus_extension
 Name:           gnome-terminal
-Version:        3.46.4
+Version:        3.46.7
 Release:        0
 Summary:        GNOME Terminal
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          System/X11/Terminals
 URL:            https://wiki.gnome.org/Apps/Terminal
 Source0:        %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM f06e6e5.patch -- util: Fix interpretation of TryExec desktop entry key
-Patch0:         https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/f06e6e5.patch
 
 BuildRequires:  appstream-glib
 BuildRequires:  desktop-file-utils