|
 |
b4d2a8 |
From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001
|
|
|
b4d2a8 |
From: David King <amigadave@amigadave.com>
|
|
|
b4d2a8 |
Date: Tue, 15 Feb 2022 10:54:40 +0000
|
|
|
b4d2a8 |
Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
|
|
|
b4d2a8 |
---
|
|
|
b4d2a8 |
src/validate.c | 3 +++
|
|
|
b4d2a8 |
1 file changed, 3 insertions(+)
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
diff --git a/src/validate.c b/src/validate.c
|
|
|
b4d2a8 |
index 62406ab..ebb03b5 100644
|
|
|
b4d2a8 |
--- a/src/validate.c
|
|
|
b4d2a8 |
+++ b/src/validate.c
|
|
|
b4d2a8 |
@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = {
|
|
|
b4d2a8 |
/* Since 1.4 */
|
|
|
b4d2a8 |
{ DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL },
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
+ /* Since 1.5 */
|
|
|
b4d2a8 |
+ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL },
|
|
|
b4d2a8 |
+
|
|
|
b4d2a8 |
/* Keys reserved for KDE */
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
/* since 0.9.4 */
|
|
|
b4d2a8 |
--
|
|
|
b4d2a8 |
2.38.1
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001
|
|
|
b4d2a8 |
From: David King <amigadave@amigadave.com>
|
|
|
b4d2a8 |
Date: Tue, 15 Feb 2022 10:56:04 +0000
|
|
|
b4d2a8 |
Subject: [PATCH 2/2] validate: Support version 1.5
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
Bump CURRENT_SPEC_VERSION to 1.5.
|
|
|
b4d2a8 |
---
|
|
|
b4d2a8 |
man/desktop-file-validate.1 | 2 +-
|
|
|
b4d2a8 |
src/validate.c | 3 +++
|
|
|
b4d2a8 |
src/validate.h | 2 +-
|
|
|
b4d2a8 |
3 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1
|
|
|
b4d2a8 |
index 8e17411..ce87c47 100644
|
|
|
b4d2a8 |
--- a/man/desktop-file-validate.1
|
|
|
b4d2a8 |
+++ b/man/desktop-file-validate.1
|
|
|
b4d2a8 |
@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files
|
|
|
b4d2a8 |
.B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE...
|
|
|
b4d2a8 |
.SH DESCRIPTION
|
|
|
b4d2a8 |
The \fIdesktop-file-validate\fP program is a tool to validate desktop
|
|
|
b4d2a8 |
-entry files according to the Desktop Entry specification 1.4.
|
|
|
b4d2a8 |
+entry files according to the Desktop Entry specification 1.5.
|
|
|
b4d2a8 |
.PP
|
|
|
b4d2a8 |
The specification describes a file format to provide information such as
|
|
|
b4d2a8 |
name, icon and description for an application. Such a file can then be
|
|
|
b4d2a8 |
diff --git a/src/validate.c b/src/validate.c
|
|
|
b4d2a8 |
index ebb03b5..f9eedee 100644
|
|
|
b4d2a8 |
--- a/src/validate.c
|
|
|
b4d2a8 |
+++ b/src/validate.c
|
|
|
b4d2a8 |
@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf,
|
|
|
b4d2a8 |
const char *locale_key,
|
|
|
b4d2a8 |
const char *value)
|
|
|
b4d2a8 |
{
|
|
|
b4d2a8 |
+ if (!strcmp (value, "1.5"))
|
|
|
b4d2a8 |
+ return TRUE;
|
|
|
b4d2a8 |
+
|
|
|
b4d2a8 |
if (!strcmp (value, "1.4"))
|
|
|
b4d2a8 |
return TRUE;
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
diff --git a/src/validate.h b/src/validate.h
|
|
|
b4d2a8 |
index e6efd93..a7952cd 100644
|
|
|
b4d2a8 |
--- a/src/validate.h
|
|
|
b4d2a8 |
+++ b/src/validate.h
|
|
|
b4d2a8 |
@@ -30,7 +30,7 @@
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
#include <glib.h>
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
-#define CURRENT_SPEC_VERSION "1.4"
|
|
|
b4d2a8 |
+#define CURRENT_SPEC_VERSION "1.5"
|
|
|
b4d2a8 |
|
|
|
b4d2a8 |
#define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry"
|
|
|
b4d2a8 |
#define GROUP_DESKTOP_ACTION "Desktop Action "
|
|
|
b4d2a8 |
--
|
|
|
b4d2a8 |
2.38.1
|
|
|
b4d2a8 |
|