diff --git a/desktop-file-utils-0.26-validate.patch b/desktop-file-utils-0.26-validate.patch new file mode 100644 index 0000000..dcdb778 --- /dev/null +++ b/desktop-file-utils-0.26-validate.patch @@ -0,0 +1,185 @@ +From 8818dac847ce50794d8fd03659d3c93d8310adbc Mon Sep 17 00:00:00 2001 +From: rezso +Date: Sat, 25 Jun 2022 23:01:09 +0000 +Subject: [PATCH 1/6] Add LXQt to registered categories. LXQt requires it. + +--- + src/validate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/validate.c b/src/validate.c +index f9eedee..1de06a7 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -537,6 +537,7 @@ static struct { + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, ++ { "LXQt", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GTK", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Qt", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Motif", FALSE, FALSE, FALSE, { NULL }, { NULL } }, +-- +GitLab + + +From 5c11578cb590cf45b2e3c094d04ca381cb054a19 Mon Sep 17 00:00:00 2001 +From: Wang Zichong +Date: Tue, 21 Mar 2023 13:43:31 +0800 +Subject: [PATCH 2/6] validate: use DDE for deepin desktop + +Since DDE (and its distro 'deepin') v23 beta, 'DDE' will be used +instead of 'Deepin', so we just also update the name here. + +Related links: + +- https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/69 +- https://www.freelists.org/post/deepin-devel/xdgspec-DDE +- https://github.com/linuxdeepin/developer-center/issues/3829 +--- + src/validate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/validate.c b/src/validate.c +index 1de06a7..a41b656 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -380,7 +380,7 @@ static DesktopKeyDefinition registered_action_keys[] = { + + /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "Deepin", "Old" ++ "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Old" + }; + + static struct { +-- +GitLab + + +From 8c83300b5f81338696765f1184a82283da25265b Mon Sep 17 00:00:00 2001 +From: Wang Zichong +Date: Tue, 23 May 2023 14:46:09 +0800 +Subject: [PATCH 3/6] validate: add DDE as a category + +Related: https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/68 +--- + src/validate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/validate.c b/src/validate.c +index a41b656..0555bc5 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -537,6 +537,7 @@ static struct { + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, ++ { "DDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "LXQt", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GTK", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Qt", FALSE, FALSE, FALSE, { NULL }, { NULL } }, +-- +GitLab + + +From 679cb6f7d46896167ec105e0713401bfaca23516 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Tue, 12 Sep 2023 10:30:51 +0100 +Subject: [PATCH 4/6] validate: Add Endless to the list of valid desktop IDs + +See https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/73 and +https://github.com/ximion/appstream/pull/522. + +Signed-off-by: Philip Withnall +--- + src/validate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/validate.c b/src/validate.c +index 0555bc5..aaa64b2 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -380,7 +380,7 @@ static DesktopKeyDefinition registered_action_keys[] = { + + /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Old" ++ "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" + }; + + static struct { +-- +GitLab + + +From 67d09f0c851cfaf0ff3ae8689c14a09ec08d6fa1 Mon Sep 17 00:00:00 2001 +From: Ryan Brue +Date: Sat, 20 Jul 2024 15:35:57 +0000 +Subject: [PATCH 5/6] validate: add COSMIC + +Signed-off-by: Ryan Brue +--- + src/validate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/validate.c b/src/validate.c +index 149ccbe..3ccf866 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -386,7 +386,7 @@ static DesktopKeyDefinition registered_action_keys[] = { + + /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" ++ "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" + }; + + static struct { +@@ -540,6 +540,7 @@ static struct { + { "Documentation", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Adult", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Core", FALSE, FALSE, FALSE, { NULL }, { NULL } }, ++ { "COSMIC", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, +-- +GitLab + + +From 673ec76e881b8dd7f710b846ae0418c09e6f5439 Mon Sep 17 00:00:00 2001 +From: Sam Day +Date: Fri, 31 Jan 2025 14:50:21 +0100 +Subject: [PATCH 6/6] validate: Add Phosh to list of valid OnlyShowIn= environments + +Signed-off-by: Sam Day +--- + src/validate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/validate.c b/src/validate.c +index 3ccf866..89a17de 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -386,7 +386,7 @@ static DesktopKeyDefinition registered_action_keys[] = { + + /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" ++ "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Phosh", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" + }; + + static struct { +@@ -543,6 +543,7 @@ static struct { + { "COSMIC", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, ++ { "Phosh", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "DDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "LXQt", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, +-- +GitLab + + diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index a8a84db..c1b5d75 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,12 +1,14 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 14%{?dist} +Release: 15%{?dist} URL: https://www.freedesktop.org/software/desktop-file-utils Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el # https://bugzilla.redhat.com/show_bug.cgi?id=2053905 Patch0: desktop-file-utils-0.26-support-1.5.patch +# Update accepted desktop IDs +Patch1: desktop-file-utils-0.26-validate.patch License: GPL-2.0-or-later BuildRequires: gcc @@ -58,6 +60,10 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Fri Aug 01 2025 Yaakov Selkowitz - 0.26-15 +- Update accepted desktop IDs + Resolves: RHEL-107113 + * Tue Oct 29 2024 Troy Dawson - 0.26-14 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018