Accepting request 1034537 from GNOME:Next
New upstream release. Note that the new .desktop file is just a link to the main .desktop file OBS-URL: https://build.opensuse.org/request/show/1034537 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=262
This commit is contained in:
Git OBS Bridge
parent
8831a2ca0a
commit
3f082c5ab5
2
_service
2
_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.3</param>
|
||||
<param name="revision">refs/tags/3.46.4</param>
|
||||
</service>
|
||||
<service name="tar" mode="buildtime" />
|
||||
<service name="recompress" mode="buildtime">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-terminal.git</param>
|
||||
<param name="changesrevision">bce00598029491f06a0681834014409dc264bf27</param></service></servicedata>
|
||||
<param name="changesrevision">44d55c8626d609d61905ef5cf11f0af2d7b7acd4</param></service></servicedata>
|
||||
79
f06e6e5.patch
Normal file
79
f06e6e5.patch
Normal file
@ -0,0 +1,79 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0dbd7a2b1d200e1716eba069a33b8c36736f58bcf9b4e7b647173101c9285698
|
||||
size 13940237
|
||||
3
gnome-terminal-3.46.4.obscpio
Normal file
3
gnome-terminal-3.46.4.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:43895d4a1dea5777c8e117992e6be9ba2d166b6f0a30619c76174baa56631b57
|
||||
size 13939725
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 07 20:02:37 UTC 2022 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.46.4:
|
||||
* all: backport: Implement xdg-terminal-exec support.
|
||||
* docs:
|
||||
- Fix some wrong info in README.
|
||||
- Fix some typos in README.
|
||||
* Updated translations.
|
||||
- Add f06e6e5.patch: util: Fix interpretation of TryExec desktop
|
||||
entry key.
|
||||
- Add appstream-glib and desktop-file-utils BuildRequires and a
|
||||
check section with meson_test macro, validate appdata and desktop
|
||||
files and run tests during build.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 27 11:11:44 UTC 2022 - bjorn.lie@gmail.com
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
name: gnome-terminal
|
||||
version: 3.46.3
|
||||
mtime: 1666369620
|
||||
commit: bce00598029491f06a0681834014409dc264bf27
|
||||
version: 3.46.4
|
||||
mtime: 1667331403
|
||||
commit: 44d55c8626d609d61905ef5cf11f0af2d7b7acd4
|
||||
|
||||
@ -18,14 +18,18 @@
|
||||
|
||||
%bcond_without nautilus_extension
|
||||
Name: gnome-terminal
|
||||
Version: 3.46.3
|
||||
Version: 3.46.4
|
||||
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
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -101,6 +105,13 @@ rm %{buildroot}/usr/share/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%fdupes %{buildroot}%{_datadir}
|
||||
|
||||
%check
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Terminal*.metainfo.xml
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.Preferences.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/xdg-terminals/org.gnome.Terminal.desktop
|
||||
%meson_test
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc %{_datadir}/help/C/%{name}/
|
||||
@ -108,6 +119,8 @@ rm %{buildroot}/usr/share/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
|
||||
%{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml
|
||||
%{_datadir}/applications/org.gnome.Terminal.desktop
|
||||
%{_datadir}/applications/org.gnome.Terminal.Preferences.desktop
|
||||
%dir %{_datadir}/xdg-terminals
|
||||
%{_datadir}/xdg-terminals/org.gnome.Terminal.desktop
|
||||
%{_libexecdir}/gnome-terminal-server
|
||||
%{_datadir}/dbus-1/services/org.gnome.Terminal.service
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user