From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 From: David King 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 */ -- 2.38.1 From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 From: David King 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 -#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 " -- 2.38.1