rpms
/
desktop-file-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import desktop-file-utils-0.26-6.el9

This commit is contained in:
CentOS Sources 2022-09-27 07:56:39 -04:00 committed by Stepan Oksanichenko
parent 3581461396
commit e387678787
2 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
SOURCES/desktop-file-utils-0.26-support-1.5.patch Normal file
View File

@ -0,0 +1,83 @@
From 48586dd1a755a80ec8ce0e8151b3ba236d81502f 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] Add support for 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.34.1
From e3e21bccfe257aa2a34d64a68582dcc2363c2606 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 "
--
2.34.1

7
SPECS/desktop-file-utils.spec
View File

@ -1,10 +1,12 @@
Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils
Version: 0.26
Release: 5%{?dist}
Release: 6%{?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=2107278
Patch0: desktop-file-utils-0.26-support-1.5.patch
License: GPLv2+
BuildRequires: gcc
@ -56,6 +58,9 @@ update-desktop-database &> /dev/null || :
%{_emacs_sitelispdir}/desktop-file-utils/
%changelog
* Fri Jul 15 2022 David King <amigadave@amigadave.com> - 0.26-6
- Support files conforming to 1.5 of the specification (#2107278)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688