From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
Date: Sun, 8 Sep 2024 13:51:33 +0000 (UTC) [thread overview]
Message-ID: <1725803424.b5b0280e7b92008879c644166456c9895b0dc123.sam@gentoo> (raw)
commit: b5b0280e7b92008879c644166456c9895b0dc123
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Sep 7 15:25:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 13:50:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b0280e
sci-libs/vtk: revbump to backport expat fix from 9.3.1
The underlaying issue is only present in IOXMLParser which we uncondionally
build but is only required by paraview. Which bundles it's own vtk.
https://gitlab.kitware.com/vtk/vtk/-/issues/19258
https://discourse.paraview.org/t/i-cannot-read-a-vtp-file-i-could-open-yesterday-can-someone-try-to-open-it/13938/4
Closes: https://bugs.gentoo.org/930032
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch | 72 ++++++++++++++++++++++
.../{vtk-9.3.0-r2.ebuild => vtk-9.3.0-r3.ebuild} | 1 +
2 files changed, 73 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
new file mode 100644
index 000000000000..ac519f98aa63
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
@@ -0,0 +1,72 @@
+From 3efa07ad277efe5c1d11a2ef2b907c095f68bbef Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <ben.boeckel@kitware.com>
+Date: Mon, 15 Apr 2024 22:22:22 -0400
+Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly
+
+Newer `libexpat` doesn't like being given the appended data after the
+artificially ended document anymore. Avoid pushing it through to its
+parser.
+
+(cherry picked from commit db8f9efca220c9d16a30958e179abae3379d0011)
+
+Fixes: #19258
+---
+ IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++-
+ IO/XMLParser/vtkXMLDataParser.h | 3 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx
+index 1f6006d37c2..7d38092fdd7 100644
+--- a/IO/XMLParser/vtkXMLDataParser.cxx
++++ b/IO/XMLParser/vtkXMLDataParser.cxx
+@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser()
+ this->RootElement = nullptr;
+ this->AppendedDataPosition = 0;
+ this->AppendedDataMatched = 0;
++ this->AppendedDataFound = false;
+ this->DataStream = nullptr;
+ this->InlineDataStream = vtkBase64InputStream::New();
+ this->AppendedDataStream = vtkBase64InputStream::New();
+@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent)
+ {
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n";
++ os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n";
+ if (this->RootElement)
+ {
+ this->RootElement->PrintXML(os, indent);
+@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete()
+ // If we have reached the appended data section, we stop parsing.
+ // This prevents the XML parser from having to walk over the entire
+ // appended data section.
+- if (this->AppendedDataPosition)
++ if (this->AppendedDataPosition || this->AppendedDataFound)
+ {
+ return 1;
+ }
+@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count)
+ {
+ return 0;
+ }
++
++ this->AppendedDataFound = true;
+ }
+
+ return 1;
+diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h
+index 1504a4d400b..142bf28327d 100644
+--- a/IO/XMLParser/vtkXMLDataParser.h
++++ b/IO/XMLParser/vtkXMLDataParser.h
+@@ -204,6 +204,9 @@ protected:
+ // How much of the string "<AppendedData" has been matched in input.
+ int AppendedDataMatched;
+
++ // Whether AppendedData has been dealt with or not.
++ bool AppendedDataFound;
++
+ // The byte order of the binary input.
+ int ByteOrder;
+
+--
+GitLab
+
diff --git a/sci-libs/vtk/vtk-9.3.0-r2.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.3.0-r2.ebuild
rename to sci-libs/vtk/vtk-9.3.0-r3.ebuild
index fa67ba0e190f..3a522724f066 100644
--- a/sci-libs/vtk/vtk-9.3.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
@@ -167,6 +167,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch"
"${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch"
"${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch"
+ "${FILESDIR}/${PN}-9.3.0-r1-expat-2.6.0.patch"
)
DOCS=( CONTRIBUTING.md README.md )
next reply other threads:[~2024-09-08 13:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-08 13:51 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-07 14:27 [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ Sam James
2023-05-03 22:23 Sam James
2023-02-27 16:46 Joonas Niilola
2022-12-12 6:09 Joonas Niilola
2022-06-26 7:09 Sam James
2022-04-02 13:06 Andreas Sturmlechner
2022-02-21 23:24 Sam James
2021-12-03 22:38 Vadim Misbakh-Soloviov
2021-05-31 11:40 Sam James
2021-05-31 11:40 Sam James
2020-12-15 2:13 Sam James
2020-11-08 13:59 Sam James
2020-06-06 9:42 Andreas Sturmlechner
2020-05-01 16:48 Matthias Maier
2017-07-06 13:37 Michael Palimaka
2017-07-06 12:49 Michael Palimaka
2017-06-02 14:59 Matthias Maier
2016-03-25 17:07 David Seifert
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=1725803424.b5b0280e7b92008879c644166456c9895b0dc123.sam@gentoo \
--to=sam@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