diff options
author | Ronny (tastytea) Gutbrod <gentoo@tastytea.de> | 2022-03-19 18:18:46 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-03-20 01:00:42 +0000 |
commit | 9a0c2d365814007808d3971c62f2bad834eb8cb4 (patch) | |
tree | 920104652d2e90b61e24bbd7c8ea5a0b62ec84a3 /dev-util/desktop-file-utils/files | |
parent | net-nds/openldap: restore MAKEOPTS patch (diff) | |
download | gentoo-9a0c2d365814007808d3971c62f2bad834eb8cb4.tar.gz gentoo-9a0c2d365814007808d3971c62f2bad834eb8cb4.tar.bz2 gentoo-9a0c2d365814007808d3971c62f2bad834eb8cb4.zip |
dev-util/desktop-file-utils: Backport support for spec 1.5
Add patch from upstream to enable support for version 1.5 of the Desktop
Entry Specification. Also bump EAPI and fix HOMEPAGE.
Upstream patch:
https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/11
Closes: https://bugs.gentoo.org/795570
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/24670
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/desktop-file-utils/files')
-rw-r--r-- | dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch new file mode 100644 index 000000000000..f4b57d8f2584 --- /dev/null +++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch @@ -0,0 +1,88 @@ +# Adds support for Desktop Entry Specification 1.5. Gentoo bug 795570. +# Upstream commit URLs: +# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c +# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea + +From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 +From: David King <amigadave@amigadave.com> +Date: Tue, 15 Feb 2022 10:54:40 +0000 +Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5 + +Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 +--- + src/validate.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/validate.c b/src/validate.c +index 62406ab..ebb03b5 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { + /* Since 1.4 */ + { DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL }, + ++ /* Since 1.5 */ ++ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, ++ + /* Keys reserved for KDE */ + + /* since 0.9.4 */ +-- +GitLab + + +From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 +From: David King <amigadave@amigadave.com> +Date: Tue, 15 Feb 2022 10:56:04 +0000 +Subject: [PATCH 2/2] validate: Support version 1.5 + +Bump CURRENT_SPEC_VERSION to 1.5. +--- + man/desktop-file-validate.1 | 2 +- + src/validate.c | 3 +++ + src/validate.h | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1 +index 8e17411..ce87c47 100644 +--- a/man/desktop-file-validate.1 ++++ b/man/desktop-file-validate.1 +@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files + .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE... + .SH DESCRIPTION + The \fIdesktop-file-validate\fP program is a tool to validate desktop +-entry files according to the Desktop Entry specification 1.4. ++entry files according to the Desktop Entry specification 1.5. + .PP + The specification describes a file format to provide information such as + name, icon and description for an application. Such a file can then be +diff --git a/src/validate.c b/src/validate.c +index ebb03b5..f9eedee 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf, + const char *locale_key, + const char *value) + { ++ if (!strcmp (value, "1.5")) ++ return TRUE; ++ + if (!strcmp (value, "1.4")) + return TRUE; + +diff --git a/src/validate.h b/src/validate.h +index e6efd93..a7952cd 100644 +--- a/src/validate.h ++++ b/src/validate.h +@@ -30,7 +30,7 @@ + + #include <glib.h> + +-#define CURRENT_SPEC_VERSION "1.4" ++#define CURRENT_SPEC_VERSION "1.5" + + #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" + #define GROUP_DESKTOP_ACTION "Desktop Action " +-- +GitLab + |