sci-visualization/gwyddion: Really fix bug 706790 and bug 710664 now

Last fix didn't work properly in all cases, so also patch
generated xml file ...

Closes: https://bugs.gentoo.org/706790
Closes: https://bugs.gentoo.org/710664
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
new file mode 100644 (file)
index 0000000..3cebcc6
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
@@ -0,0 +1,15 @@
+diff --git a/data/gwyddion.xml b/data/gwyddion.xml
+index d26089f..acb7b90 100644
+--- a/data/gwyddion.xml
++++ b/data/gwyddion.xml
+@@ -55,8 +55,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-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
similarity index 97%
rename from sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
rename to sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
index 81eb34a955aed74a4e054260537398c679cf902f..335e80a5c600b909cf9a518c9e207b7a10ab74cf 100644 (file)
--- a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
        "${FILESDIR}/${PN}-2.55-automagic.patch"
        "${FILESDIR}/${PN}-2.55-mime.patch"
+       "${FILESDIR}/${PN}-2.55-xml.patch"
 )
 
 src_prepare() {