summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel <dilfridge@gentoo.org>2020-03-09 09:32:26 +0100
committerAndreas K. Huettel <dilfridge@gentoo.org>2020-03-09 09:41:26 +0100
commitd31f43e4f2935e8cca08ca8f1205a4ec21575eeb (patch)
tree9b55acb5831bdb12a9e8f1435daac2ecec955122 /sci-visualization
parentRevert "sci-visualization/gwyddion: Temporarily require gtk-doc, bug 710664" (diff)
downloadgentoo-d31f43e4f2935e8cca08ca8f1205a4ec21575eeb.tar.gz
gentoo-d31f43e4f2935e8cca08ca8f1205a4ec21575eeb.tar.bz2
gentoo-d31f43e4f2935e8cca08ca8f1205a4ec21575eeb.zip
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>
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch15
-rw-r--r--sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild (renamed from sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild)1
2 files changed, 16 insertions, 0 deletions
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
index 000000000000..3cebcc684b50
--- /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
index 81eb34a955ae..335e80a5c600 100644
--- 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() {