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 CB4BF158041 for ; Sat, 2 Mar 2024 22:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04F4DE2A2E; Sat, 2 Mar 2024 22:04:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B62B5E2A2E for ; Sat, 2 Mar 2024 22:04:31 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8EC3343001 for ; Sat, 2 Mar 2024 22:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6034E119 for ; Sat, 2 Mar 2024 22:04:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1709417048.1bbdb0fc566d1ce9d924685dc186b26177055678.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/abiword/abiword-3.0.5-r1.ebuild app-office/abiword/abiword-3.0.5.ebuild app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch X-VCS-Directories: app-office/abiword/files/ app-office/abiword/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1bbdb0fc566d1ce9d924685dc186b26177055678 X-VCS-Branch: master Date: Sat, 2 Mar 2024 22:04:29 +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: 959f809e-12f6-453d-b46c-0133171cfbe9 X-Archives-Hash: c2598453d18fa19d264dd614285fc6e6 commit: 1bbdb0fc566d1ce9d924685dc186b26177055678 Author: Sam James gentoo org> AuthorDate: Sat Mar 2 22:04:08 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 2 22:04:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbdb0fc app-office/abiword: fix build w/ libxml2-2.12 Closes: https://bugs.gentoo.org/923394 Signed-off-by: Sam James gentoo.org> ...biword-3.0.5.ebuild => abiword-3.0.5-r1.ebuild} | 3 ++- .../abiword/files/abiword-3.0.5-libxml2-2.12.patch | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild similarity index 98% rename from app-office/abiword/abiword-3.0.5.ebuild rename to app-office/abiword/abiword-3.0.5-r1.ebuild index ff7b3097fd9b..4e942cdb2686 100644 --- a/app-office/abiword/abiword-3.0.5.ebuild +++ b/app-office/abiword/abiword-3.0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -85,6 +85,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch "${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch "${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch + "${FILESDIR}"/${PN}-3.0.5-libxml2-2.12.patch ) src_prepare() { diff --git a/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch new file mode 100644 index 000000000000..a8f82e2d844a --- /dev/null +++ b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch @@ -0,0 +1,25 @@ +https://gitlab.gnome.org/World/AbiWord/-/commit/2a06be6a10a0718f8a3d8e00c317f5042c99a467 +https://bugs.gentoo.org/923394 + +From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Mon, 11 Dec 2023 01:55:53 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. +Let’s add the correct include. +--- a/src/af/util/xp/ut_stringbuf.cpp ++++ b/src/af/util/xp/ut_stringbuf.cpp +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + #include + +-- +GitLab