From 2f7d52a9ba19f0ab857477b6eae937710e6e88d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= <joger.hansegard@qt.io>
Date: Mon, 26 Aug 2024 20:26:51 +0200
Subject: [PATCH] Update tika-mimetypes.xml from upstream

This patch updates the tika-mimetypes.xml MIME types definition file to
version 5ea8bbf1644a593ed22ee5c7608ba33aff949d5d, which is currently the
latest on main.

The reason for the change is to include audio/aac as an alias for the
deprecated audio/x-aac MIME type, which is useful in QtMultimedia to
determine the file extension for AAC media files.

In addition, the update adds the application/x-java-keystore MIME type,
similar to the one in the old freedesktop.org.xml MIME type definition.

[ChangeLog][Third-Party Code] Updated TIKA MIME types definition file to
add the audio/aac and application/x-java-keystore MIME types.

Pick-to: 6.7 6.5
Change-Id: I14fa331c5c57e4fae8f8b31880dc66d6ca559f62
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit 5774aa2560b65a67e72f98cf2f776325b6760950)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/mimetypes/3rdparty/qt_attribution.json     |  6 +++---
 src/corelib/mimetypes/3rdparty/tika-mimetypes.xml      | 10 ++++++++++
 .../mimetypes/qmimedatabase/tst_qmimedatabase.cpp      |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/corelib/mimetypes/3rdparty/qt_attribution.json b/src/corelib/mimetypes/3rdparty/qt_attribution.json
index 7ed6c198b9f..848fff28f1d 100644
--- a/src/corelib/mimetypes/3rdparty/qt_attribution.json
+++ b/src/corelib/mimetypes/3rdparty/qt_attribution.json
@@ -16,11 +16,11 @@
                 "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": "019041117149667bc4d18fabf222a0670d407959",
+        "Version": "5ea8bbf1644a593ed22ee5c7608ba33aff949d5d",
         "DownloadLocation":
-                "https://github.com/apache/tika/blob/019041117149667bc4d18fabf222a0670d407959/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml",
+                "https://github.com/apache/tika/blob/5ea8bbf1644a593ed22ee5c7608ba33aff949d5d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml",
         "License": "Apache License 2.0",
         "LicenseId": "Apache-2.0",
-        "Copyright": "Copyright 2011 The Apache Software Foundation"
+        "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 739877cc4eb..dc06f270be9 100644
--- a/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml
+++ b/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml
@@ -4957,6 +4957,15 @@
       <match value="-----BEGIN EC PARAMETERS-----" type="string" offset="0"/>
     </magic>
   </mime-type>
+  <mime-type type="application/x-java-keystore">
+    <comment>Java Keystore</comment>
+    <tika:link>https://en.wikipedia.org/wiki/Java_KeyStore</tika:link>
+    <magic priority="50">
+      <!-- magic byte: https://en.wikipedia.org/wiki/List_of_file_signatures -->
+        <match value="\xfe\xed\xfe\xed" type="string" offset="0:4"/>
+    </magic>
+    <glob pattern="*.jks" />
+  </mime-type>
 
   <mime-type type="application/x-xfig">
     <glob pattern="*.fig"/>
@@ -5534,6 +5543,7 @@
   <mime-type type="audio/vnd.vmx.cvsd"/>
   <mime-type type="audio/vorbis-config"/>
   <mime-type type="audio/x-aac">
+    <alias type="audio/aac"/>
     <glob pattern="*.aac"/>
     <magic priority="30">
       <!-- Without ID3 tags -->
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 472d2ecf691..5d42e46c323 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -800,7 +800,7 @@ void tst_QMimeDatabase::allMimeTypes()
     if (m_hasFreedesktopOrg)
         QCOMPARE(lst.size(), 908);
     else
-        QCOMPARE(lst.size(), 1640); // interestingly, tika has more mimetypes (but many are empty)
+        QCOMPARE(lst.size(), 1641); // interestingly, tika has more mimetypes (but many are empty)
 
     for (const QMimeType &mime : lst) {
         const QString name = mime.name();