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

Add 'font' as a valid media type (#1564650, fdo#105785)

Browse Source
This commit is contained in:
Adam Williamson 2018-04-09 14:49:55 -07:00
parent 68b737c5b9
commit 6af4353332
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
desktop-file-utils-0.23-font-media.patch Normal file
View File

@ -0,0 +1,30 @@
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

11
desktop-file-utils.spec
View File

@ -4,7 +4,7 @@
Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils
Version: 0.23
Release: 7%{?dist}
Release: 8%{?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
@ -12,6 +12,9 @@ Source1: desktop-entry-mode-init.el
# 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+
BuildRequires: glib2-devel
@ -32,8 +35,7 @@ fixing it up in the process.
%prep
%setup -q
%patch0 -p1 -b .add-pantheon
%autosetup -p1
%build
%configure
@ -66,6 +68,9 @@ update-desktop-database &> /dev/null || :
%{_emacs_sitelispdir}/%{pkg}
%changelog
* Mon Apr 09 2018 Adam Williamson <awilliam@redhat.com> - 0.23-8
- Add 'font' as a valid media type (#1564650, fdo#105785)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild