Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
Date: Tue, 28 Jan 2020 00:09:08
Message-Id: 1580170120.474366dad65b7205550ebdaccbecc231a639f638.dilfridge@gentoo
1 commit: 474366dad65b7205550ebdaccbecc231a639f638
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 00:07:46 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 28 00:08:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474366da
7
8 sci-visualization/gwyddion: Fix generated mime data
9
10 Patch backported from upstream trunk
11
12 Closes: https://bugs.gentoo.org/706790
13 Package-Manager: Portage-2.3.85, Repoman-2.3.20
14 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
15
16 sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch | 15 +++++++++++++++
17 .../{gwyddion-2.55-r1.ebuild => gwyddion-2.55-r2.ebuild} | 1 +
18 2 files changed, 16 insertions(+)
19
20 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
21 new file mode 100644
22 index 00000000000..536790c1ac4
23 --- /dev/null
24 +++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
25 @@ -0,0 +1,15 @@
26 +Index: gwyddion/modules/file/ambprofile.c
27 +===================================================================
28 +--- gwyddion/modules/file/ambprofile.c (revision 22650)
29 ++++ gwyddion/modules/file/ambprofile.c (revision 22651)
30 +@@ -32,8 +32,8 @@
31 + * <comment>Ambios XML profile data</comment>
32 + * <magic priority="80">
33 + * <match type="string" offset="0" value="&lt;?xml">
34 +- * <match type="string" offset="40:120" value="<ProfilometerData>">
35 +- * <match type="string" offset="60:140" value="<Header>"/>
36 ++ * <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
37 ++ * <match type="string" offset="60:140" value="&lt;Header&gt;"/>
38 + * </match>
39 + * </match>
40 + * </magic>
41
42 diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
43 similarity index 97%
44 rename from sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
45 rename to sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
46 index 7029da852fc..af6b4601506 100644
47 --- a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
48 +++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
49 @@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
50
51 PATCHES=(
52 "${FILESDIR}/${PN}-2.55-automagic.patch"
53 + "${FILESDIR}/${PN}-2.55-mime.patch"
54 )
55
56 src_prepare() {