diff --git a/0001-validate-support-SingleMainWindow-key-from-1.5.patch b/0001-validate-support-SingleMainWindow-key-from-1.5.patch deleted file mode 100644 index f494367..0000000 --- a/0001-validate-support-SingleMainWindow-key-from-1.5.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 47ab968995ae864d3681833040e17b8f1af4cb38 Mon Sep 17 00:00:00 2001 -From: David King -Date: Tue, 15 Feb 2022 10:54:40 +0000 -Subject: [PATCH] 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 821be7d..10d1872 100644 ---- a/src/validate.c -+++ b/src/validate.c -@@ -329,6 +329,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { - /* SuSE specific */ - { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL }, - -+ /* Since 1.5 */ -+ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, -+ - /* Keys reserved for KDE */ - - /* since 0.9.4 */ --- -2.36.1 - diff --git a/0002-validate-Support-version-1.5.patch b/0002-validate-Support-version-1.5.patch deleted file mode 100644 index 3ad84b1..0000000 --- a/0002-validate-Support-version-1.5.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e1f28bc5673f6cb281f3f4bdd8d8264d8ced6253 Mon Sep 17 00:00:00 2001 -From: David King -Date: Tue, 15 Feb 2022 10:56:04 +0000 -Subject: [PATCH] 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 10d1872..87f196e 100644 ---- a/src/validate.c -+++ b/src/validate.c -@@ -964,6 +964,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.36.1 - diff --git a/desktop-file-utils-0.26.tar.xz b/desktop-file-utils-0.26.tar.xz deleted file mode 100644 index 889572b..0000000 --- a/desktop-file-utils-0.26.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b26dbde79ea72c8c84fb7f9d870ffd857381d049a86d25e0038c4cef4c747309 -size 83132 diff --git a/desktop-file-utils-0.27.tar.xz b/desktop-file-utils-0.27.tar.xz new file mode 100644 index 0000000..b4cb9b7 --- /dev/null +++ b/desktop-file-utils-0.27.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0817df39ce385b6621880407c56f1f298168c040c2032cedf88d5b76affe836 +size 80808 diff --git a/desktop-file-utils-suse-keys.patch b/desktop-file-utils-suse-keys.patch index dccedff..0e81bce 100644 --- a/desktop-file-utils-suse-keys.patch +++ b/desktop-file-utils-suse-keys.patch @@ -1,11 +1,10 @@ -diff -r -U 5 a/src/validate.c b/src/validate.c ---- a/src/validate.c 2020-06-19 -+++ b/src/validate.c 2020-06-29 -@@ -324,10 +324,13 @@ - { DESKTOP_BOOLEAN_TYPE, "DBusActivatable", FALSE, FALSE, FALSE, handle_dbus_activatable_key }, - - /* Since 1.4 */ - { DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL }, +Index: b/src/validate.c +=================================================================== +--- a/src/validate.c ++++ b/src/validate.c +@@ -329,6 +329,9 @@ static DesktopKeyDefinition registered_d + /* Since 1.5 */ + { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, + /* SuSE specific */ + { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL }, @@ -13,5 +12,3 @@ diff -r -U 5 a/src/validate.c b/src/validate.c /* Keys reserved for KDE */ /* since 0.9.4 */ - { DESKTOP_STRING_TYPE, "ServiceTypes", FALSE, FALSE, TRUE, NULL }, - { DESKTOP_STRING_TYPE, "DocPath", FALSE, FALSE, TRUE, NULL }, diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index d9d9d94..f2c8996 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Oct 6 20:46:05 UTC 2023 - Antonio Teixeira + +- Update to version 0.27: + * common + + Remove Autotools support. + + Minor updates to project documentation. + + Add pledge(2) support to remaining utilities + + Add --version support to utilities. + * desktop-file-validate + + Support desktop spec version 1.5. + + Add LXQt to categories. + + Use DDE category for Deepin desktop. + + Add Endless to list of desktop IDs. + + Fix field code escaping in messages. + * desktop-entry-mode.el + + Highlight action groups when ID includes hyphens. +- Drop patches (upstreamed): + * 0001-validate-support-SingleMainWindow-key-from-1.5.patch + * 0002-validate-Support-version-1.5.patch +- Refresh desktop-file-utils-suse-keys.patch + ------------------------------------------------------------------- Thu Apr 20 09:04:41 UTC 2023 - Guido Berhoerster diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 3e386db..1ef51b9 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -17,7 +17,7 @@ Name: desktop-file-utils -Version: 0.26 +Version: 0.27 Release: 0 Summary: Utilities for Manipulating Desktop Files License: GPL-2.0-or-later @@ -31,9 +31,6 @@ Source3: install_man.py Patch0: desktop-file-utils-suse-keys.patch # PATCH-FIX-OPENSUSE install_man_desktop-file-edit_as_symlink.patch -- With Source3 makes manual page "desktop-file-edit.1" a symlink instead of a copy. Patch1: install_man_desktop-file-edit_as_symlink.patch -# PATCH-FIX-UPSTREAM -- SingleMainWindow is present in xdg-specs 1.5 and can be used by both GNOME and KDE -Patch2: 0001-validate-support-SingleMainWindow-key-from-1.5.patch -Patch3: 0002-validate-Support-version-1.5.patch BuildRequires: glib2-devel BuildRequires: meson >= 0.49.0 BuildRequires: pkgconfig