From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
Date: Sat, 16 Mar 2024 20:50:05 +0000 (UTC) [thread overview]
Message-ID: <1710622167.6ae8f0c2bc5a33b534d1f73cbf09f32940d02057.conikost@gentoo> (raw)
commit: 6ae8f0c2bc5a33b534d1f73cbf09f32940d02057
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:49:27 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:49:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae8f0c2
net-im/swift: fix compilation with libxml2-2.12
Closes: https://bugs.gentoo.org/923288
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch | 11 +++++++++++
net-im/swift/swift-4.0.3-r2.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
new file mode 100644
index 000000000000..b08a480835f3
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/Swiften/Parser/LibXMLParser.cpp
++++ b/Swiften/Parser/LibXMLParser.cpp
+@@ -97,7 +97,7 @@
+ if (xmlParseChunk(p->context_, data.c_str(), boost::numeric_cast<int>(data.size()), false) == XML_ERR_OK) {
+ return true;
+ }
+- xmlError* error = xmlCtxtGetLastError(p->context_);
++ const xmlError* error = xmlCtxtGetLastError(p->context_);
+ if (error->code == XML_WAR_NS_URI || error->code == XML_WAR_NS_URI_RELATIVE) {
+ xmlCtxtResetLastError(p->context_);
+ p->context_->errNo = XML_ERR_OK;
diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild
index 686e9cf6c7c7..792b487871ed 100644
--- a/net-im/swift/swift-4.0.3-r2.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.2-boost-1.69-compatibility.patch
"${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch
"${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch
+ "${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch
"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
)
next reply other threads:[~2024-03-16 20:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-16 20:50 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-28 20:25 [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/ Conrad Kostecki
2023-10-04 14:42 Conrad Kostecki
2020-08-26 21:43 Conrad Kostecki
2019-04-16 11:04 David Seifert
2018-11-24 2:46 Andrey Utkin
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=1710622167.6ae8f0c2bc5a33b534d1f73cbf09f32940d02057.conikost@gentoo \
--to=conikost@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