From f2a5284d94121e5bc757b5b671c1655b2df7af2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= <joger.hansegard@qt.io>
Date: Sun, 1 Sep 2024 12:14:57 +0200
Subject: [PATCH] Update tika-mimetypes.xml from upstream

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>
---
 src/corelib/mimetypes/3rdparty/qt_attribution.json | 4 ++--
 src/corelib/mimetypes/3rdparty/tika-mimetypes.xml  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/corelib/mimetypes/3rdparty/qt_attribution.json b/src/corelib/mimetypes/3rdparty/qt_attribution.json
index 848fff28f1d..0efdf1b46c3 100644
--- a/src/corelib/mimetypes/3rdparty/qt_attribution.json
+++ b/src/corelib/mimetypes/3rdparty/qt_attribution.json
@@ -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)",
         "Homepage":
                 "https://github.com/apache/tika/tree/main/tika-core/src/main/resources/org/apache/tika/mime",
-        "Version": "5ea8bbf1644a593ed22ee5c7608ba33aff949d5d",
+        "Version": "5101bc7fb090ed7deffe56837d7633c9485a1e5d",
         "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",
         "LicenseId": "Apache-2.0",
         "Copyright": "Copyright 2024 The Apache Software Foundation"
diff --git a/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml b/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml
index dc06f270be9..2bade04109f 100644
--- a/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml
+++ b/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml
@@ -5620,6 +5620,7 @@
   </mime-type>
 
   <mime-type type="audio/x-flac">
+    <alias type="audio/flac" />
     <acronym>FLAC</acronym>
     <comment>Free Lossless Audio Codec</comment>
     <magic priority="50">