From f493596e66141f87c6ac78bc9e869c38c5a7830617cd0ef51f910e12e9d52668 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Dec 2022 14:36:40 +0000 Subject: [PATCH] Accepting request 1040244 from GNOME:Next - 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. OBS-URL: https://build.opensuse.org/request/show/1040244 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=264 --- _service | 2 +- _servicedata | 2 +- f06e6e5.patch | 79 ----------------------------------- gnome-terminal-3.46.4.obscpio | 3 -- gnome-terminal-3.46.7.obscpio | 3 ++ gnome-terminal.changes | 26 ++++++++++++ gnome-terminal.obsinfo | 6 +-- gnome-terminal.spec | 4 +- 8 files changed, 35 insertions(+), 90 deletions(-) delete mode 100644 f06e6e5.patch delete mode 100644 gnome-terminal-3.46.4.obscpio create mode 100644 gnome-terminal-3.46.7.obscpio diff --git a/_service b/_service index 59e5a44..f4e7684 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ git @PARENT_TAG@ enable - refs/tags/3.46.4 + refs/tags/3.46.7 diff --git a/_servicedata b/_servicedata index 3fe4baa..bf55fd7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.gnome.org/GNOME/gnome-terminal.git - 44d55c8626d609d61905ef5cf11f0af2d7b7acd4 \ No newline at end of file + 816edf80cd7bf7f253366099ea9fcaf361676139 \ No newline at end of file diff --git a/f06e6e5.patch b/f06e6e5.patch deleted file mode 100644 index b94ff17..0000000 --- a/f06e6e5.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f06e6e5821a1a718431d25ccd8d08225ba66dd58 Mon Sep 17 00:00:00 2001 -From: Christian Persch -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 - diff --git a/gnome-terminal-3.46.4.obscpio b/gnome-terminal-3.46.4.obscpio deleted file mode 100644 index da9f475..0000000 --- a/gnome-terminal-3.46.4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43895d4a1dea5777c8e117992e6be9ba2d166b6f0a30619c76174baa56631b57 -size 13939725 diff --git a/gnome-terminal-3.46.7.obscpio b/gnome-terminal-3.46.7.obscpio new file mode 100644 index 0000000..d677995 --- /dev/null +++ b/gnome-terminal-3.46.7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d23c86f0334ea57a0baf9b14a1a13669cdd0237f2fa9145cafca825cf850918f +size 13934605 diff --git a/gnome-terminal.changes b/gnome-terminal.changes index 3099183..77caa34 100644 --- a/gnome-terminal.changes +++ b/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 diff --git a/gnome-terminal.obsinfo b/gnome-terminal.obsinfo index ab7fa1b..3b8929c 100644 --- a/gnome-terminal.obsinfo +++ b/gnome-terminal.obsinfo @@ -1,4 +1,4 @@ name: gnome-terminal -version: 3.46.4 -mtime: 1667331403 -commit: 44d55c8626d609d61905ef5cf11f0af2d7b7acd4 +version: 3.46.7 +mtime: 1670015214 +commit: 816edf80cd7bf7f253366099ea9fcaf361676139 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index ab3df76..ed3131f 100644 --- a/gnome-terminal.spec +++ b/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