Update to 0.24

This commit is contained in:
Kalev Lember 2019-08-14 16:03:37 +02:00
parent abcac8c921
commit 50f0dd1ced
5 changed files with 7 additions and 65 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ desktop-file-utils-0.16.tar.bz2
/desktop-file-utils-0.21.tar.xz /desktop-file-utils-0.21.tar.xz
/desktop-file-utils-0.22.tar.xz /desktop-file-utils-0.22.tar.xz
/desktop-file-utils-0.23.tar.xz /desktop-file-utils-0.23.tar.xz
/desktop-file-utils-0.24.tar.xz

View File

@ -1,25 +0,0 @@
From 5b88c95c45e91781aed441c446210c6979350c3f Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sat, 20 Aug 2016 10:36:57 +0200
Subject: Added Pantheon to the list of desktop environments
https://bugs.freedesktop.org/show_bug.cgi?id=97385
diff --git a/src/validate.c b/src/validate.c
index bd31fd5..d414a53 100644
--- a/src/validate.c
+++ b/src/validate.c
@@ -366,8 +366,9 @@ static DesktopKeyDefinition registered_action_keys[] = {
{ DESKTOP_STRING_TYPE, "Exec", TRUE, FALSE, FALSE, handle_exec_key }
};
+/* This should be the same list as in xdg-specs/menu/menu-spec.xml */
static const char *show_in_registered[] = {
- "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Cinnamon", "EDE", "Old"
+ "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Old"
};
static struct {
--
cgit v0.10.2

View File

@ -1,30 +0,0 @@
From 16fa31708d6b6af047352d1a78a7eab823b63221 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 9 Apr 2018 17:06:37 -0400
Subject: [PATCH] Add font as valid media type
This was codified in RFC 8081, and some desktop apps are using
this now.
---
src/mimeutils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mimeutils.c b/src/mimeutils.c
index 0833fdb..bddc7a0 100644
--- a/src/mimeutils.c
+++ b/src/mimeutils.c
@@ -52,9 +52,9 @@ static const char *known_old_fdo_media_types[] = {
"x-directory"
};
-/* Defined in RFC 2045/2046 and RFC 2077 */
+/* Defined in RFC 2045/2046, RFC 2077 and RFC 8081 */
static const char *registered_discrete_media_types[] = {
- "application", "audio", "image", "model", "text", "video"
+ "application", "audio", "font", "image", "model", "text", "video"
};
/* Defined in RFC 2045/2046 */
--
2.17.0

View File

@ -3,18 +3,11 @@
Summary: Utilities for manipulating .desktop files Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils Name: desktop-file-utils
Version: 0.23 Version: 0.24
Release: 11%{?dist} Release: 1%{?dist}
URL: https://www.freedesktop.org/software/desktop-file-utils URL: https://www.freedesktop.org/software/desktop-file-utils
Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
Source1: desktop-entry-mode-init.el Source1: desktop-entry-mode-init.el
# Add Pantheon to the list of desktop environments (#1333550, fdo#97385)
# upstream patch by David Faure
# https://cgit.freedesktop.org/xdg/desktop-file-utils/commit/?id=5b88c95c45e91781aed441c446210c6979350c3f
Patch0: desktop-file-utils-0.23-add-pantheon.patch
# Add 'font' as a valid media type (#1564650, fdo#105785)
# patch from Matthias Clasen
Patch1: desktop-file-utils-0.23-font-media.patch
License: GPLv2+ License: GPLv2+
BuildRequires: gcc BuildRequires: gcc
@ -69,6 +62,9 @@ update-desktop-database &> /dev/null || :
%{_emacs_sitelispdir}/%{pkg} %{_emacs_sitelispdir}/%{pkg}
%changelog %changelog
* Wed Aug 14 2019 Kalev Lember <klember@redhat.com> - 0.24-1
- Update to 0.24
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
599133d51cc9a41bfec186414906b6f1 desktop-file-utils-0.23.tar.xz SHA512 (desktop-file-utils-0.24.tar.xz) = b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0