[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/

[Andreas K. Hüttel]

commit:     474366dad65b7205550ebdaccbecc231a639f638
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 00:07:46 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 00:08:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474366da

sci-visualization/gwyddion: Fix generated mime data

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 <AT> gentoo.org>

 sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch | 15 +++++++++++++++
 .../{gwyddion-2.55-r1.ebuild => gwyddion-2.55-r2.ebuild}  |  1 +
 2 files changed, 16 insertions(+)

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 00000000000..536790c1ac4
--- /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 7029da852fc..af6b4601506 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() {