From 474366dad65b7205550ebdaccbecc231a639f638 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Tue, 28 Jan 2020 01:07:46 +0100
Subject: [PATCH] sci-visualization/gwyddion: Fix generated mime data
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch backported from upstream trunk

Closes: https://bugs.gentoo.org/706790
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 .../gwyddion/files/gwyddion-2.55-mime.patch       | 15 +++++++++++++++
 ...ion-2.55-r1.ebuild => gwyddion-2.55-r2.ebuild} |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
 rename sci-visualization/gwyddion/{gwyddion-2.55-r1.ebuild => gwyddion-2.55-r2.ebuild} (97%)

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
new file mode 100644
index 000000000000..536790c1ac46
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
@@ -0,0 +1,15 @@
+Index: gwyddion/modules/file/ambprofile.c
+===================================================================
+--- gwyddion/modules/file/ambprofile.c	(revision 22650)
++++ gwyddion/modules/file/ambprofile.c	(revision 22651)
+@@ -32,8 +32,8 @@
+  *   <comment>Ambios XML profile data</comment>
+  *   <magic priority="80">
+  *     <match type="string" offset="0" value="&lt;?xml">
+- *       <match type="string" offset="40:120" value="<ProfilometerData>">
+- *          <match type="string" offset="60:140" value="<Header>"/>
++ *       <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
++ *          <match type="string" offset="60:140" value="&lt;Header&gt;"/>
+  *       </match>
+  *     </match>
+  *   </magic>
diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
similarity index 97%
rename from sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
rename to sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
index 7029da852fcc..af6b46015063 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.55-automagic.patch"
+	"${FILESDIR}/${PN}-2.55-mime.patch"
 )
 
 src_prepare() {
-- 
2.26.2