1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tika-mimetypes.xml from upstream

Browse Source 
This patch updates the tika-mimetypes.xml MIME types definition file to
version 5101bc7fb090ed7deffe56837d7633c9485a1e5d, which is currently the
latest on upstream main.

The reason for the change is to include audio/flac as an alias for the
nonstandard audio/x-flac MIME type, which enables QtMultimedia to
automatically determine a suitable file-extension for FLAC audio files.

[ChangeLog][Third-Party Code] Updated TIKA MIME types definition file to
add the audio/flac MIME type as an alias for audio/x-flac MIME type.

Pick-to: 6.7 6.5
Change-Id: Id2596f5aea55041a1cbbdcbfbd7500b652444bad
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 265187518d13571ff2b991a00ec0011df61f7ae5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Jøger Hansegård 2024-09-01 12:14:57 +02:00 committed by Qt Cherry-pick Bot
parent 30981cf522
commit f2a5284d94
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/mimetypes/3rdparty/qt_attribution.json vendored
View File

@ -16,9 +16,9 @@
"The Apache Tika MimeTypes list many known MIME types and how to match files (using globs and/or 'magic' rules for the file contents)", "The Apache Tika MimeTypes list many known MIME types and how to match files (using globs and/or 'magic' rules for the file contents)",
"Homepage": "Homepage":
"https://github.com/apache/tika/tree/main/tika-core/src/main/resources/org/apache/tika/mime", "https://github.com/apache/tika/tree/main/tika-core/src/main/resources/org/apache/tika/mime",
"Version": "5ea8bbf1644a593ed22ee5c7608ba33aff949d5d", "Version": "5101bc7fb090ed7deffe56837d7633c9485a1e5d",
"DownloadLocation": "DownloadLocation":
"https://github.com/apache/tika/blob/5ea8bbf1644a593ed22ee5c7608ba33aff949d5d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml", "https://github.com/apache/tika/blob/5101bc7fb090ed7deffe56837d7633c9485a1e5d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml",
"License": "Apache License 2.0", "License": "Apache License 2.0",
"LicenseId": "Apache-2.0", "LicenseId": "Apache-2.0",
"Copyright": "Copyright 2024 The Apache Software Foundation" "Copyright": "Copyright 2024 The Apache Software Foundation"

1
src/corelib/mimetypes/3rdparty/tika-mimetypes.xml vendored
View File

@ -5620,6 +5620,7 @@
</mime-type> </mime-type>
<mime-type type="audio/x-flac"> <mime-type type="audio/x-flac">
<alias type="audio/flac" />
<acronym>FLAC</acronym> <acronym>FLAC</acronym>
<comment>Free Lossless Audio Codec</comment> <comment>Free Lossless Audio Codec</comment>
<magic priority="50"> <magic priority="50">