From 9d300d52cd8b9df82758ce622269cf2491148851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 13 May 2021 00:20:21 +0300
Subject: [PATCH 1/2] image/x-xpixmap: add XPM2 magic

https://en.wikipedia.org/wiki/X_PixMap#XPM2
---
 data/freedesktop.org.xml.in        |  1 +
 tests/mime-detection/list          |  2 ++
 tests/mime-detection/test-xpm2.xpm | 11 +++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 tests/mime-detection/test-xpm2.xpm

diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index a7f71da..40064f2 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -5556,6 +5556,7 @@ command to generate the output files.
     <expanded-acronym>X PixMap</expanded-acronym>
     <magic priority="50">
       <match type="string" value="/* XPM" offset="0"/>
+      <match type="string" value="! XPM2\n" offset="0"/>
     </magic>
     <glob pattern="*.xpm"/>
     <alias type="image/x-xpm"/>
diff --git a/tests/mime-detection/list b/tests/mime-detection/list
index 5633399..ee124de 100644
--- a/tests/mime-detection/list
+++ b/tests/mime-detection/list
@@ -63,6 +63,8 @@ test.pat image/x-gimp-pat
 lucid-tab-bg.xcf image/x-xcf
 weather_sun.xcf image/x-xcf
 test.xpm image/x-xpixmap
+# Copied from https://en.wikipedia.org/wiki/X_PixMap
+test-xpm2.xpm image/x-xpixmap
 test.xwd image/x-xwindowdump ox
 # Copied from http://djvu.org/resources/
 2001_compression_overview.djvu image/vnd.djvu+multipage xoo
diff --git a/tests/mime-detection/test-xpm2.xpm b/tests/mime-detection/test-xpm2.xpm
new file mode 100644
index 0000000..f5183eb
--- /dev/null
+++ b/tests/mime-detection/test-xpm2.xpm
@@ -0,0 +1,11 @@
+! XPM2
+16 7 2 1
+* c #000000
+. c #ffffff
+**..*...........
+*.*.*...........
+**..*..**.**..**
+*.*.*.*.*.*..*.*
+**..*..**.*...**
+...............*
+.............**.
-- 
GitLab


From 4de8683ab043a35ff05d7a03ba27fe54f87f9514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 13 May 2021 00:20:58 +0300
Subject: [PATCH 2/2] image/x-xpixmap: make XPM3 magic more specific

---
 data/freedesktop.org.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index 40064f2..6907b15 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -5555,7 +5555,7 @@ command to generate the output files.
     <acronym>XPM</acronym>
     <expanded-acronym>X PixMap</expanded-acronym>
     <magic priority="50">
-      <match type="string" value="/* XPM" offset="0"/>
+      <match type="string" value="/* XPM */" offset="0"/>
       <match type="string" value="! XPM2\n" offset="0"/>
     </magic>
     <glob pattern="*.xpm"/>
-- 
GitLab