Blob Blame History Raw
From e6d2f2633d468b0a4bb5688fceb9ce08387b1429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 8 Feb 2017 13:08:34 +0200
Subject: [PATCH 2/6] font/ttf: Use IANA registered type

https://www.iana.org/assignments/media-types/font/ttf
---
 freedesktop.org.xml.in | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index e2ff392..452714a 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -2029,111 +2029,112 @@ command to generate the output files.
     <magic priority="50">
       <match type="string" value="\x14\x02\x59\x19" offset="0"/>
     </magic>
   </mime-type>
   <mime-type type="application/x-font-linux-psf">
     <_comment>Linux PSF console font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="\x36\x04" offset="0"/>
     </magic>
     <glob pattern="*.psf"/>
   </mime-type>
   <mime-type type="application/x-gz-font-linux-psf">
     <_comment>Linux PSF console font (gzip-compressed)</_comment>
     <sub-class-of type="application/gzip"/>
     <generic-icon name="font-x-generic"/>
     <glob pattern="*.psf.gz"/>
   </mime-type>
   <mime-type type="application/x-font-pcf">
     <_comment>PCF font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="\001fcp" offset="0"/>
     </magic>
     <glob pattern="*.pcf"/>
     <glob pattern="*.pcf.Z"/>
     <glob pattern="*.pcf.gz"/>
   </mime-type>
   <mime-type type="application/x-font-otf">
     <_comment>OpenType font</_comment>
-    <sub-class-of type="application/x-font-ttf"/>
+    <sub-class-of type="font/ttf"/>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="OTTO" offset="0"/>
     </magic>
     <glob pattern="*.otf"/>
   </mime-type>
   <mime-type type="application/x-font-speedo">
     <_comment>Speedo font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="D1.0\015" offset="0"/>
     </magic>
     <glob pattern="*.spd"/>
   </mime-type>
   <mime-type type="application/x-font-sunos-news">
     <_comment>SunOS News font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="StartFont" offset="0"/>
       <match type="string" value="\x13\x7A\x29" offset="0"/>
       <match type="string" value="\x13\x7A\x2B" offset="8"/>
     </magic>
   </mime-type>
   <mime-type type="application/x-font-tex">
     <_comment>TeX font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="\367\203" offset="0"/>
       <match type="string" value="\367\131" offset="0"/>
       <match type="string" value="\367\312" offset="0"/>
     </magic>
   </mime-type>
   <mime-type type="application/x-font-tex-tfm">
     <_comment>TeX font metrics</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="\000\021" offset="2"/>
       <match type="string" value="\000\022" offset="2"/>
     </magic>
   </mime-type>
-  <mime-type type="application/x-font-ttf">
+  <mime-type type="font/ttf">
     <_comment>TrueType font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="FFIL" offset="0"/>
       <match type="string" value="FFIL" offset="65"/>
       <match type="string" value="\000\001\000\000\000" offset="0"/>
     </magic>
     <glob pattern="*.ttf"/>
     <glob pattern="*.ttc"/>
+    <alias type="application/x-font-ttf"/>
   </mime-type>
   <mime-type type="application/x-font-ttx">
     <_comment>TrueType XML font</_comment>
     <sub-class-of type="application/xml"/>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="&lt;ttFont sfntVersion=&quot;\\x00\\x01\\x00\\x00&quot; ttLibVersion=&quot;" offset="0:256"/>
     </magic>
     <glob pattern="*.ttx"/>
   </mime-type>
   <mime-type type="application/x-font-vfont">
     <_comment>V font</_comment>
     <generic-icon name="font-x-generic"/>
     <magic priority="50">
       <match type="string" value="FONT" offset="0"/>
     </magic>
   </mime-type>
   <mime-type type="application/vnd.framemaker">
     <_comment>Adobe FrameMaker document</_comment>
     <generic-icon name="x-office-document"/>
     <magic priority="50">
       <match type="string" value="&lt;MakerFile" offset="0"/>
       <match type="string" value="&lt;MIFFile" offset="0"/>
       <match type="string" value="&lt;MakerDictionary" offset="0"/>
       <match type="string" value="&lt;MakerScreenFon" offset="0"/>
       <match type="string" value="&lt;MML" offset="0"/>
       <match type="string" value="&lt;Book" offset="0"/>
       <match type="string" value="&lt;Maker" offset="0"/>
     </magic>
     <glob pattern="*.fm"/>