From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7EF06158041 for ; Sat, 16 Mar 2024 20:50:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92789E29B4; Sat, 16 Mar 2024 20:50:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B485E29B4 for ; Sat, 16 Mar 2024 20:50:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2EAED33BE32 for ; Sat, 16 Mar 2024 20:50:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C5D67E7 for ; Sat, 16 Mar 2024 20:50:05 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1710622167.6ae8f0c2bc5a33b534d1f73cbf09f32940d02057.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch net-im/swift/swift-4.0.3-r2.ebuild X-VCS-Directories: net-im/swift/files/ net-im/swift/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 6ae8f0c2bc5a33b534d1f73cbf09f32940d02057 X-VCS-Branch: master Date: Sat, 16 Mar 2024 20:50:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c7c8dbe4-5c68-4866-a66b-31e47fa0810d X-Archives-Hash: 619eea98ef846d7dc79f68aab904f104 commit: 6ae8f0c2bc5a33b534d1f73cbf09f32940d02057 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Mar 16 20:49:27 2024 +0000 Commit: Conrad Kostecki gentoo 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 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(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 )