From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/
Date: Mon, 9 Mar 2020 08:45:13 +0000 (UTC) [thread overview]
Message-ID: <1583743286.d31f43e4f2935e8cca08ca8f1205a4ec21575eeb.dilfridge@gentoo> (raw)
commit: d31f43e4f2935e8cca08ca8f1205a4ec21575eeb
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 08:32:26 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 08:41:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31f43e4
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 <AT> gentoo.org>
sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch | 15 +++++++++++++++
.../{gwyddion-2.55-r2.ebuild => gwyddion-2.55-r4.ebuild} | 1 +
2 files changed, 16 insertions(+)
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 00000000000..3cebcc684b5
--- /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="<?xml">
+- <match type="string" offset="40:120" value="<ProfilometerData>">
+- <match type="string" offset="60:140" value="<Header>"/>
++ <match type="string" offset="40:120" value="<ProfilometerData>">
++ <match type="string" offset="60:140" value="<Header>"/>
+ </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 81eb34a955a..335e80a5c60 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() {
next reply other threads:[~2020-03-09 8:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 8:45 Andreas K. Hüttel [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-28 19:32 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/ Andrew Ammerlaan
2021-03-02 9:06 Michał Górny
2020-06-30 10:47 Andreas K. Hüttel
2020-02-24 13:36 Andreas Sturmlechner
2020-01-24 4:35 Andreas K. Hüttel
2020-01-24 3:50 Andreas K. Hüttel
2017-01-02 22:09 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1583743286.d31f43e4f2935e8cca08ca8f1205a4ec21575eeb.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox