updated to shared-mime-info-1.6

f99d7233 · fa1d98bc · f99d7233 · f99d7233
Commit f99d7233 authored Jun 29, 2016 by
Hide whitespace changes
Inline Side-by-side

Showing with 95 additions and 40 deletions

lib/mimemagic/tables.rb
+36 -22

script/freedesktop.org.xml
+59 -18

No files found.
--- a/lib/mimemagic/tables.rb
+++ b/lib/mimemagic/tables.rb
@@ -210,6 +210,8 @@ class MimeMagic
    'gedcom' => 'application/x-gedcom',
    'gem' => 'application/x-tar',
    'gen' => 'application/x-genesis-rom',
+    'geo.json' => 'application/vnd.geo+json',
+    'geojson' => 'application/vnd.geo+json',
    'gf' => 'application/x-tex-gf',
    'gg' => 'application/x-sms-rom',
    'gif' => 'image/gif',
@@ -225,6 +227,7 @@ class MimeMagic
    'gp' => 'application/x-gnuplot',
    'gpg' => 'application/pgp-encrypted',
    'gplt' => 'application/x-gnuplot',
+    'gpx' => 'application/gpx+xml',
    'gra' => 'application/x-graphite',
    'gs' => 'text/x-genie',
    'gsf' => 'application/x-font-type1',
@@ -514,6 +517,7 @@ class MimeMagic
    'pict1' => 'image/x-pict',
    'pict2' => 'image/x-pict',
    'pk' => 'application/x-tex-pk',
+    'pkg' => 'application/x-xar',
    'pkipath' => 'application/pkix-pkipath',
    'pkr' => 'application/pgp-keys',
    'pl' => 'application/x-perl',
@@ -818,12 +822,15 @@ class MimeMagic
    'wwf' => 'application/x-wwf',
    'x3f' => 'image/x-sigma-x3f',
    'xac' => 'application/x-gnucash',
+    'xar' => 'application/x-xar',
    'xbel' => 'application/x-xbel',
    'xbl' => 'application/xml',
    'xbm' => 'image/x-xbitmap',
    'xcf' => 'image/x-xcf',
    'xcf.bz2' => 'image/x-compressed-xcf',
    'xcf.gz' => 'image/x-compressed-xcf',
+    'xdgapp' => 'application/vnd.xdgapp',
+    'xht' => 'application/xhtml+xml',
    'xhtml' => 'application/xhtml+xml',
    'xi' => 'audio/x-xi',
    'xla' => 'application/vnd.ms-excel',
@@ -880,6 +887,7 @@ class MimeMagic
    'application/font-woff' => [%w(woff), %w(), 'WOFF font'],
    'application/gml+xml' => [%w(gml), %w(application/xml), 'GML document'],
    'application/gnunet-directory' => [%w(gnd), %w(), 'GNUnet search file'],
+    'application/gpx+xml' => [%w(gpx), %w(application/xml), 'GPX geographic data'],
    'application/gzip' => [%w(gz), %w(), 'Gzip archive'],
    'application/illustrator' => [%w(ai), %w(), 'Adobe Illustrator document'],
    'application/javascript' => [%w(js jsm), %w(application/ecmascript), 'JavaScript program'],
@@ -929,6 +937,7 @@ class MimeMagic
    'application/vnd.corel-draw' => [%w(cdr), %w(), 'Corel Draw drawing'],
    'application/vnd.debian.binary-package' => [%w(deb udeb), %w(), 'Debian package'],
    'application/vnd.emusic-emusic_package' => [%w(emp), %w(), 'eMusic download package'],
+    'application/vnd.geo+json' => [%w(geo.json geojson), %w(application/json), 'GeoJSON geospatial data'],
    'application/vnd.google-earth.kml+xml' => [%w(kml), %w(application/xml), 'KML geographic data'],
    'application/vnd.google-earth.kmz' => [%w(kmz), %w(application/zip), 'KML geographic compressed data'],
    'application/vnd.hp-hpgl' => [%w(hpgl), %w(), 'HPGL file'],
@@ -1017,6 +1026,7 @@ class MimeMagic
    'application/vnd.tcpdump.pcap' => [%w(cap dmp pcap), %w(), 'Network Packet Capture'],
    'application/vnd.visio' => [%w(vsd vss vst vsw), %w(application/x-ole-storage), 'Microsoft Visio document'],
    'application/vnd.wordperfect' => [%w(wp wp4 wp5 wp6 wpd wpp), %w(), 'WordPerfect document'],
+    'application/vnd.xdgapp' => [%w(xdgapp), %w(), 'XDG application bundle'],
    'application/winhlp' => [%w(hlp), %w(), 'WinHelp help file'],
    'application/x-7z-compressed' => [%w(7z), %w(), '7-zip archive'],
    'application/x-abiword' => [%w(abw abw.crashed abw.gz zabw), %w(application/xml), 'AbiWord document'],
@@ -1214,6 +1224,7 @@ class MimeMagic
    'application/x-wpg' => [%w(wpg), %w(), 'WordPerfect/Drawperfect image'],
    'application/x-wwf' => [%w(wwf), %w(application/pdf), 'WWF document'],
    'application/x-x509-ca-cert' => [%w(cert crt der pem), %w(), 'DER/PEM/Netscape-encoded X.509 certificate'],
+    'application/x-xar' => [%w(pkg xar), %w(), 'XAR archive'],
    'application/x-xbel' => [%w(xbel), %w(application/xml), 'XBEL bookmarks'],
    'application/x-xliff' => [%w(xlf xliff), %w(application/xml), 'XLIFF translation file'],
    'application/x-xpinstall' => [%w(xpi), %w(application/zip), 'XPInstall installer module'],
@@ -1223,7 +1234,7 @@ class MimeMagic
    'application/x-yaml' => [%w(yaml yml), %w(text/plain), 'YAML document'],
    'application/x-zip-compressed-fb2' => [%w(fb2.zip), %w(application/zip), 'Compressed FictionBook document'],
    'application/x-zoo' => [%w(zoo), %w(), 'Zoo archive'],
-    'application/xhtml+xml' => [%w(xhtml), %w(application/xml), 'XHTML page'],
+    'application/xhtml+xml' => [%w(xht xhtml), %w(application/xml), 'XHTML page'],
    'application/xml' => [%w(rng xbl xml xsd), %w(text/plain), 'XML document'],
    'application/xml-dtd' => [%w(dtd), %w(text/plain), 'DTD file'],
    'application/xml-external-parsed-entity' => [%w(ent), %w(application/xml), 'XML entities document'],
@@ -1515,8 +1526,14 @@ class MimeMagic
    ['application/vnd.apple.mpegurl', [[0, '#EXTM3U', [[0..128, '#EXT-X-TARGETDURATION'], [0..128, '#EXT-X-STREAM-INF']]]]],
    ['text/x-opml+xml', [[0..256, '<opml ']]],
    ['application/msword', [[0, "1\276\000\000"], [0, 'PO^Q`'], [0, "\3767\000#"], [0, "\333\245-\000\000\000"], [2112, 'MSWordDoc'], [2108, 'MSWordDoc'], [2112, 'Microsoft Word document data'], [546, 'bjbj'], [546, 'jbjb']]],
+    ['application/vnd.ms-cab-compressed', [[0, "MSCF\000\000\000\000"]]],
    ['application/vnd.ms-wpl', [[0..256, '<?wpl']]],
+    ['application/x-7z-compressed', [[0, "7z\274\257'\034"]]],
+    ['application/x-ace', [[7, '**ACE**']]],
+    ['application/x-arc', []],
+    ['application/x-cpio', [[0, "\307q"], [0, '070701'], [0, '070702'], [0, "q\307"]]],
    ['application/x-font-type1', [[0, 'LWFN'], [65, 'LWFN'], [0, '%!PS-AdobeFont-1.'], [6, '%!PS-AdobeFont-1.'], [0, '%!FontType1-1.'], [6, '%!FontType1-1.']]],
+    ['application/x-java-pack200', [[0, "\312\376\320\r"]]],
    ['application/x-karbon', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-karbon\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-karbon']]]]]]],
    ['application/x-kchart', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-kchart\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-kchart']]]]]]],
    ['application/x-kformula', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-kformula\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-kformula']]]]]]],
@@ -1527,7 +1544,21 @@ class MimeMagic
    ['application/x-krita', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-krita\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-krita']]]]]]],
    ['application/x-kspread', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-kspread\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-kspread']]]]]]],
    ['application/x-kword', [[0, "\037\213", [[10, 'KOffice', [[18, "application/x-kword\004\006"]]]]], [0, "PK\003\004", [[30, 'mimetype', [[38, 'application/x-kword']]]]]]],
+    ['application/x-lha', [[2, '-lh -'], [2, '-lh0-'], [2, '-lh1-'], [2, '-lh2-'], [2, '-lh3-'], [2, '-lh4-'], [2, '-lh5-'], [2, '-lh40-'], [2, '-lhd-'], [2, '-lz4-'], [2, '-lz5-'], [2, '-lzs-']]],
+    ['application/x-lrzip', [[0, 'LRZI']]],
+    ['application/x-lz4', [[0, "\004\"M\030"], [0, "\002!L\030"]]],
+    ['application/x-lzip', [[0, 'LZIP']]],
+    ['application/x-lzop', [[0, "\211LZO\000\r\n\032\n"]]],
+    ['application/x-par2', [[0, 'PAR2']]],
+    ['application/x-qpress', [[0, 'qpress10']]],
    ['application/x-quicktime-media-link', [[0, '<?xml', [[0..64, '<?quicktime']]], [0, 'RTSPtext'], [0, 'rtsptext'], [0, 'SMILtext']]],
+    ['application/x-rar', [[0, 'Rar!']]],
+    ['application/x-stuffit', [[0, 'StuffIt '], [0, 'SIT!']]],
+    ['application/x-tar', [[257, "ustar\000"], [257, "ustar  \000"]]],
+    ['application/x-xar', [[0, 'xar!']]],
+    ['application/x-xz', [[0, "\3757zXZ\000"]]],
+    ['application/x-zoo', [[20, "\334\247\304\375"]]],
+    ['application/xhtml+xml', [[0..256, '//W3C//DTD XHTML '], [0..256, 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'], [0..256, "<html xmlns=\"http://www.w3.org/1999/xhtml"], [0..256, "<HTML xmlns=\"http://www.w3.org/1999/xhtml"]]],
    ['audio/vnd.dts.hd', [[0..18725, 'dX %']]],
    ['text/x-txt2tags', [[0, '%!postproc'], [0, '%!encoding']]],
    ['application/smil+xml', [[0..256, '<smil']]],
@@ -1560,7 +1591,6 @@ class MimeMagic
    ['application/vnd.lotus-wordpro', [[0, 'WordPro']]],
    ['application/vnd.ms-access', [[0, "\000\001\000\000Standard Jet DB"]]],
    ['application/vnd.ms-asf', [[0, "0&\262u"], [0, '[Reference]']]],
-    ['application/vnd.ms-cab-compressed', [[0, "MSCF\000\000\000\000"]]],
    ['application/vnd.ms-excel', [[2080, 'Microsoft Excel 5.0 Worksheet']]],
    ['application/vnd.ms-tnef', [[0, "x\237>\""]]],
    ['application/vnd.oasis.opendocument.chart', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.chart']]]]]]],
@@ -1593,16 +1623,14 @@ class MimeMagic
    ['application/vnd.symbian.install', [[8, "\031\004\000\020"]]],
    ['application/vnd.tcpdump.pcap', [[0, "\324\303\262\241"], [0, "\241\262\303\324"]]],
    ['application/vnd.wordperfect', [[1, 'WPC']]],
+    ['application/vnd.xdgapp', [[0, "xdg-app\000\001\000\211\345"]]],
    ['application/winhlp', [[0, "?_\003\000"]]],
-    ['application/x-7z-compressed', [[0, "7z\274\257'\034"]]],
    ['application/x-abiword', [[0..256, '<abiword'], [0..256, '<!DOCTYPE abiword']]],
-    ['application/x-ace', [[7, '**ACE**']]],
    ['application/x-alz', [[0, 'ALZ']]],
    ['application/x-amiga-disk-format', [[0, "DOS\000"]]],
    ['application/x-aportisdoc', [[60, 'TEXtREAd'], [60, 'TEXtTlDc']]],
    ['application/x-applix-spreadsheet', [[0, '*BEGIN SPREADSHEETS'], [0, '*BEGIN', [[7, 'SPREADSHEETS']]]]],
    ['application/x-applix-word', [[0, '*BEGIN', [[7, 'WORDS']]]]],
-    ['application/x-arc', []],
    ['application/x-arj', [[0, "`\352"]]],
    ['application/x-awk', [[0, '#!/bin/gawk'], [0, '#! /bin/gawk'], [0, '#!/usr/bin/gawk'], [0, '#! /usr/bin/gawk'], [0, '#!/usr/local/bin/gawk'], [0, '#! /usr/local/bin/gawk'], [0, '#!/bin/awk'], [0, '#! /bin/awk'], [0, '#!/usr/bin/awk'], [0, '#! /usr/bin/awk']]],
    ['application/x-bittorrent', [[0, 'd8:announce']]],
@@ -1614,7 +1642,6 @@ class MimeMagic
    ['application/x-cisco-vpn-settings', [[0, '[main]', [[0..256, 'AuthType=']]]]],
    ['application/x-compress', [[0, "\037\235"]]],
    ['application/x-core', [[0, "\177ELF", [[5, "\001", [[16, "\004\000"]]]]], [0, "\177ELF", [[5, "\002", [[16, "\000\004"]]]]], [0, "Core\001"], [0, "Core\002"]]],
-    ['application/x-cpio', [[0, "\307q"], [0, '070701'], [0, '070702'], [0, "q\307"]]],
    ['application/x-csh', [[2..16, '/bin/tcsh'], [2..16, '/bin/csh'], [2..16, '/bin/env csh'], [2..16, '/bin/env tcsh']]],
    ['application/x-dar', [[0, "\000\000\000{"]]],
    ['application/x-designer', [[0..256, '<ui '], [0..256, '<UI ']]],
@@ -1659,16 +1686,10 @@ class MimeMagic
    ['application/x-java-jce-keystore', [[0, "\316\316\316\316"]]],
    ['application/x-java-jnlp-file', [[0..256, '<jnlp']]],
    ['application/x-java-keystore', [[0, "\355\376\355\376"]]],
-    ['application/x-java-pack200', [[0, "\312\376\320\r"]]],
    ['application/x-kspread-crypt', [[0, "\r\032'\002"]]],
    ['application/x-ksysv-package', [[4, 'KSysV', [[15, "\001"]]]]],
    ['application/x-kword-crypt', [[0, "\r\032'\001"]]],
-    ['application/x-lha', [[2, '-lh -'], [2, '-lh0-'], [2, '-lh1-'], [2, '-lh2-'], [2, '-lh3-'], [2, '-lh4-'], [2, '-lh5-'], [2, '-lh40-'], [2, '-lhd-'], [2, '-lz4-'], [2, '-lz5-'], [2, '-lzs-']]],
-    ['application/x-lrzip', [[0, 'LRZI']]],
    ['application/x-lyx', [[0, '#LyX']]],
-    ['application/x-lz4', [[0, "\004\"M\030"], [0, "\002!L\030"]]],
-    ['application/x-lzip', [[0, 'LZIP']]],
-    ['application/x-lzop', [[0, "\211LZO\000\r\n\032\n"]]],
    ['application/x-macbinary', [[102, 'mBIN']]],
    ['application/x-matroska', [[0, "\032E\337\243", [[5..65, "B\202", [[8..75, 'matroska']]]]]]],
    ['application/x-ms-dos-executable', [[0, 'MZ']]],
@@ -1681,14 +1702,11 @@ class MimeMagic
    ['application/x-object', [[0, "\177ELF", [[5, "\001", [[16, "\001\000"]]]]], [0, "\177ELF", [[5, "\002", [[16, "\000\001"]]]]]]],
    ['application/x-ole-storage', [[0, "\320\317\021\340\241\261\032\341"], [0, "\320\317\021\340"]]],
    ['application/x-oleo', [[31, 'Oleo']]],
-    ['application/x-par2', [[0, 'PAR2']]],
    ['application/x-pef-executable', [[0, 'Joy!']]],
    ['application/x-perl', [[0, "eval \"exec /usr/local/bin/perl"], [2..16, '/bin/perl'], [2..16, '/bin/env perl'], [0..256, 'use strict'], [0..256, 'use warnings'], [0..256, 'use diagnostics'], [0..256, 'use Test::'], [0..256, 'BEGIN {']]],
    ['application/x-pocket-word', [[0, "{\\pwi"]]],
    ['application/x-python-bytecode', [[0, "\231N\r\n"]]],
-    ['application/x-qpress', [[0, 'qpress10']]],
    ['application/x-qtiplot', [[0, 'QtiPlot']]],
-    ['application/x-rar', [[0, 'Rar!']]],
    ['application/x-rpm', [[0, "\355\253\356\333"]]],
    ['application/x-ruby', [[2..16, '/bin/env ruby'], [2..16, '/bin/ruby']]],
    ['application/x-sami', [[0..256, '<SAMI>']]],
@@ -1702,17 +1720,13 @@ class MimeMagic
    ['application/x-spss-sav', [[0, '$FL2'], [0, '$FL3']]],
    ['application/x-sqlite2', [[0, '** This file contains an SQLite']]],
    ['application/x-sqlite3', [[0, 'SQLite format 3']]],
-    ['application/x-stuffit', [[0, 'StuffIt '], [0, 'SIT!']]],
    ['application/x-subrip', [[0, '1', [[0..256, ' --> ']]]]],
    ['application/x-t602', [[0, '@CT 0'], [0, '@CT 1'], [0, '@CT 2']]],
-    ['application/x-tar', [[257, "ustar\000"], [257, "ustar  \000"]]],
    ['application/x-tgif', [[0, '%TGIF']]],
    ['application/x-wii-rom', [[24, "]\034\236\243"], [0, 'WBFS'], [0, "WII\001DISC"]]],
    ['application/x-wii-wad', [[4, "Is\000\000"], [4, "ib\000\000"], [4, "Bk\000\000"]]],
    ['application/x-xbel', [[0..256, '<!DOCTYPE xbel']]],
-    ['application/x-xz', [[0, "\3757zXZ\000"]]],
    ['application/x-yaml', [[0, '%YAML']]],
-    ['application/x-zoo', [[20, "\334\247\304\375"]]],
    ['application/xslt+xml', [[0..256, '<xsl:stylesheet']]],
    ['application/xspf+xml', [[0..64, "<playlist version=\"1"], [0..64, "<playlist version='1"]]],
    ['audio/AMR', [[0, "#!AMR\n"], [0, "#!AMR_MC1.0\n"]]],
@@ -1781,8 +1795,8 @@ class MimeMagic
    ['image/x-olympus-orf', [[0, "IIRO\b\000\000\000"]]],
    ['image/x-panasonic-raw', [[0, "IIU\000\b\000\000\000"]]],
    ['image/x-panasonic-raw2', [[0, "IIU\000\030\000\000\000"]]],
-    ['image/x-pict', [[522, "\000\021", [[524, "\002\377", [[526, "\f\000", [[528, "\377\376"]]]]]]]]],
    ['image/x-pict', [[10, "\000\021", [[12, "\002\377", [[14, "\f\000", [[16, "\377\376"]]]]]]]]],
+    ['image/x-pict', [[522, "\000\021", [[524, "\002\377", [[526, "\f\000", [[528, "\377\376"]]]]]]]]],
    ['image/x-portable-bitmap', [[0, 'P1', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]], [0, 'P4', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]]]],
    ['image/x-portable-graymap', [[0, 'P2', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]], [0, 'P5', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]]]],
    ['image/x-portable-pixmap', [[0, 'P3', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]], [0, 'P6', [[2, "\n"], [2, ' '], [2, "\t"], [2, "\r"]]]]],
@@ -1821,10 +1835,10 @@ class MimeMagic
    ['text/x-makefile', [[0, '#!/usr/bin/make'], [0, '#! /usr/bin/make']]],
    ['text/x-matlab', [[0, 'function']]],
    ['text/x-microdvd', [[0, '{1}'], [0, '{0}'], [0..6, '}{']]],
-    ['text/x-modelica', [[0, 'record']]],
-    ['text/x-modelica', [[0, 'class']]],
    ['text/x-modelica', [[0, 'function']]],
+    ['text/x-modelica', [[0, 'class']]],
    ['text/x-modelica', [[0, 'model']]],
+    ['text/x-modelica', [[0, 'record']]],
    ['text/x-mpsub', [[0..256, 'FORMAT=']]],
    ['text/x-mrml', [[0, '<mrml ']]],
    ['text/x-ms-regedit', [[0, 'REGEDIT'], [0, 'Windows Registry Editor Version 5.00'], [0, "\377\376W\000i\000n\000d\000o\000w\000s\000 \000R\000e\000g\000i\000s\000t\000r\000y\000 \000E\000d\000i\000t\000o\000r\000"]]],

--- a/script/freedesktop.org.xml
+++ b/script/freedesktop.org.xml
@@ -2711,7 +2711,7 @@
    <comment xml:lang="zh_CN">Microsoft CAB 归档文件</comment>
    <comment xml:lang="zh_TW">微軟 Cabinet 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="MSCF\0\0\0\0" type="string" offset="0"/>
    </magic>
    <glob pattern="*.cab"/>
@@ -6267,7 +6267,7 @@
    <comment xml:lang="zh_CN">7-zip 归档文件</comment>
    <comment xml:lang="zh_TW">7-zip 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="7z\274\257\047\034" type="string" offset="0"/>
    </magic>
    <glob pattern="*.7z"/>
@@ -6657,7 +6657,7 @@
    <comment xml:lang="zh_CN">ARC 归档文件</comment>
    <comment xml:lang="zh_TW">ARC 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="0x0000081a" type="little32" offset="0" mask="0x8080ffff"/>
      <match value="0x0000091a" type="little32" offset="0" mask="0x8080ffff"/>
      <match value="0x0000021a" type="little32" offset="0" mask="0x8080ffff"/>
@@ -7574,7 +7574,7 @@
    <comment xml:lang="zh_CN">Lrzip 归档文件</comment>
    <comment xml:lang="zh_TW">Lrzip 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="LRZI" type="string" offset="0"/>
    </magic>
    <glob pattern="*.lrz"/>
@@ -8226,7 +8226,7 @@
    <comment xml:lang="zh_CN">CPIO 归档文件</comment>
    <comment xml:lang="zh_TW">CPIO 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="070707" type="host16" offset="0"/>
      <match value="070701" type="string" offset="0"/>
      <match value="070702" type="string" offset="0"/>
@@ -11724,7 +11724,7 @@
    <comment xml:lang="zh_CN">Pack200 Java 归档文件</comment>
    <comment xml:lang="zh_TW">Pack200 Java 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="0xcafed00d" type="big32" offset="0"/>
    </magic>
    <glob pattern="*.pack"/>
@@ -13031,7 +13031,7 @@
    <comment xml:lang="zh_CN">LHA 归档文件</comment>
    <comment xml:lang="zh_TW">LHA 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="-lh -" type="string" offset="2"/>
      <match value="-lh0-" type="string" offset="2"/>
      <match value="-lh1-" type="string" offset="2"/>
@@ -13245,7 +13245,7 @@
    <comment xml:lang="zh_CN">LZ4 归档文件</comment>
    <comment xml:lang="zh_TW">LZ4 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="0x184d2204" type="little32" offset="0"/>
      <match value="0x184c2102" type="little32" offset="0"/>
    </magic>
@@ -13294,7 +13294,7 @@
    <comment xml:lang="zh_CN">Lzip 归档文件</comment>
    <comment xml:lang="zh_TW">Lzip 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="LZIP" type="string" offset="0"/>
    </magic>
    <glob pattern="*.lz"/>
@@ -13454,7 +13454,7 @@
    <acronym>LZO</acronym>
    <expanded-acronym>Lempel-Ziv-Oberhumer</expanded-acronym>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" type="string" offset="0"/>
    </magic>
    <glob pattern="*.lzo"/>
@@ -13490,11 +13490,23 @@
    <comment xml:lang="zh_CN">Qpress 归档文件</comment>
    <comment xml:lang="zh_TW">Qpress 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="qpress10" type="string" offset="0"/>
    </magic>
    <glob pattern="*.qp"/>
  </mime-type>
+  <mime-type type="application/x-xar">
+    <comment>XAR archive</comment>
+    <acronym>XAR</acronym>
+    <expanded-acronym>eXtensible ARchive</expanded-acronym>
+    <generic-icon name="package-x-generic"/>
+    <magic priority="60">
+      <match value="0x78617221" type="big32" offset="0"/>
+    </magic>
+    <glob pattern="*.xar"/>
+    <glob pattern="*.pkg"/>
+  </mime-type>
  <mime-type type="application/zlib">
    <comment>Zlib archive</comment>
    <comment xml:lang="ca">arxiu Zlib</comment>
@@ -15919,7 +15931,7 @@
    <acronym>Parchive</acronym>
    <expanded-acronym>Parity Volume Set Archive</expanded-acronym>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="PAR2" type="string" offset="0"/>
    </magic>
    <glob pattern="*.PAR2"/>
@@ -16730,7 +16742,7 @@
    <expanded-acronym>Roshal ARchive</expanded-acronym>
    <alias type="application/x-rar-compressed"/>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="Rar!" type="string" offset="0"/>
    </magic>
    <glob pattern="*.rar"/>
@@ -17825,7 +17837,7 @@
    <generic-icon name="package-x-generic"/>
    <alias type="application/stuffit"/>
    <alias type="application/x-sit"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="StuffIt " type="string" offset="0"/>
      <match value="SIT!" type="string" offset="0"/>
    </magic>
@@ -18593,7 +18605,7 @@
    <comment xml:lang="zh_TW">Tar 封存檔</comment>
    <generic-icon name="package-x-generic"/>
    <alias type="application/x-gtar"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="ustar\0" type="string" offset="257"/>
      <match value="ustar\040\040\0" type="string" offset="257"/>
    </magic>
@@ -19190,7 +19202,7 @@
    <comment xml:lang="zh_CN">XZ 归档文件</comment>
    <comment xml:lang="zh_TW">XZ 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="\xfd\x37\x7a\x58\x5a\x00" type="string" offset="0"/>
    </magic>
    <glob pattern="*.xz"/>
@@ -19594,7 +19606,7 @@
    <comment xml:lang="zh_CN">Zoo 归档文件</comment>
    <comment xml:lang="zh_TW">Zoo 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="0xfdc4a7dc" type="little32" offset="20"/>
    </magic>
    <glob pattern="*.zoo"/>
@@ -19653,6 +19665,13 @@
    <sub-class-of type="application/xml"/>
    <generic-icon name="text-html"/>
    <glob pattern="*.xhtml"/>
+    <glob pattern="*.xht"/>
+    <magic priority="60">
+      <match value="//W3C//DTD XHTML " type="string" offset="0:256"/>
+      <match value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" type="string" offset="0:256"/>
+      <match value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
+      <match value="&lt;HTML xmlns=&quot;http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
+    </magic>
    <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
  </mime-type>
  <mime-type type="application/zip">
@@ -29666,7 +29685,7 @@
    <comment xml:lang="zh_CN">ACE 归档文件</comment>
    <comment xml:lang="zh_TW">ACE 封存檔</comment>
    <generic-icon name="package-x-generic"/>
-    <magic priority="50">
+    <magic priority="60">
      <match value="**ACE**" type="string" offset="7"/>
    </magic>
    <glob pattern="*.ace"/>
@@ -34995,6 +35014,19 @@
    <sub-class-of type="application/zip"/>
    <glob pattern="*.kmz"/>
  </mime-type>
+  <mime-type type="application/vnd.geo+json">
+    <comment>GeoJSON geospatial data</comment>
+    <sub-class-of type="application/json"/>
+    <glob pattern="*.geojson"/>
+    <glob pattern="*.geo.json"/>
+  </mime-type>
+  <mime-type type="application/gpx+xml">
+    <comment>GPX geographic data</comment>
+    <acronym>GPX</acronym>
+    <expanded-acronym>GPS Exchange Format</expanded-acronym>
+    <sub-class-of type="application/xml"/>
+    <glob pattern="*.gpx"/>
+  </mime-type>
  <mime-type type="application/x-ica">
    <comment>Citrix ICA settings file</comment>
    <comment xml:lang="ar">ملف إعدادات Citrix ICA</comment>
@@ -36808,4 +36840,12 @@
    <glob pattern="*.adf"/>
  </mime-type>
+  <mime-type type="application/vnd.xdgapp">
+    <comment>XDG application bundle</comment>
+    <magic priority="50">
+      <match value="xdg-app\x00\x01\x00\x89\xe5" type="string" offset="0"/>
+    </magic>
+    <glob pattern="*.xdgapp"/>
+  </mime-type>
 </mime-info>
\ No newline at end of file