diff options
| author |   Sam James <sam@gentoo.org> | 2024-03-02 22:04:08 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-03-02 22:04:08 +0000 |
| commit | 1bbdb0fc566d1ce9d924685dc186b26177055678 (patch) | |
| tree | 1a9b2fb08eb30908001fe18e8df561d3f36e627d /app-office | |
| parent | profiles/features/musl: improve rust-bin mask message (diff) | |
| download | gentoo-1bbdb0fc566d1ce9d924685dc186b26177055678.tar.gz gentoo-1bbdb0fc566d1ce9d924685dc186b26177055678.tar.bz2 gentoo-1bbdb0fc566d1ce9d924685dc186b26177055678.zip | |
app-office/abiword: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/923394
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/abiword/abiword-3.0.5-r1.ebuild (renamed from app-office/abiword/abiword-3.0.5.ebuild) | 3 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/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 <jtojnar@gmail.com> +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 <algorithm> + + #include <libxml/uri.h> ++#include <libxml/xmlmemory.h> + + #include <glib.h> + +-- +GitLab |