From 1bbdb0fc566d1ce9d924685dc186b26177055678 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 2 Mar 2024 22:04:08 +0000 Subject: app-office/abiword: fix build w/ libxml2-2.12 Closes: https://bugs.gentoo.org/923394 Signed-off-by: Sam James --- app-office/abiword/abiword-3.0.5-r1.ebuild | 159 +++++++++++++++++++++ app-office/abiword/abiword-3.0.5.ebuild | 158 -------------------- .../abiword/files/abiword-3.0.5-libxml2-2.12.patch | 25 ++++ 3 files changed, 184 insertions(+), 158 deletions(-) create mode 100644 app-office/abiword/abiword-3.0.5-r1.ebuild delete mode 100644 app-office/abiword/abiword-3.0.5.ebuild create mode 100644 app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch (limited to 'app-office') diff --git a/app-office/abiword/abiword-3.0.5-r1.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild new file mode 100644 index 000000000000..4e942cdb2686 --- /dev/null +++ b/app-office/abiword/abiword-3.0.5-r1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg + +DESCRIPTION="Fully featured yet light and fast cross platform word processor" +HOMEPAGE="http://www.abisource.com/" +SRC_URI=" + http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz + https://dev.gentoo.org/~soap/distfiles/${PN}-3.0.4-patchset-r3.txz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus" +# You need 'plugins' enabled if want to enable the extra plugins +REQUIRED_USE=" + collab? ( plugins ) + grammar? ( plugins ) + latex? ( plugins ) + math? ( plugins ) + ots? ( plugins ) + readline? ( plugins ) + thesaurus? ( plugins ) + wordperfect? ( plugins ) + wmf? ( plugins )" + +RDEPEND=" + >=app-text/wv-1.2 + >=dev-libs/fribidi-0.10.4 + >=dev-libs/glib-2.16:2 + >=dev-libs/libgcrypt-1.4.5:0= + dev-libs/libxslt + >=gnome-base/librsvg-2.16:2 + >=gnome-extra/libgsf-1.14.18:= + >=media-libs/libpng-1.2:0= + virtual/jpeg:0 + >=x11-libs/cairo-1.10 + >=x11-libs/gtk+-3.0.8:3[cups?] + calendar? ( >=dev-libs/libical-0.46:= ) + eds? ( >=gnome-extra/evolution-data-server-3.6.0:= ) + goffice? ( >=x11-libs/goffice-0.10.2:0.10 ) + introspection? ( >=dev-libs/gobject-introspection-1.0.0:= ) + map? ( >=media-libs/libchamplain-0.12:0.12[gtk] ) + plugins? ( + collab? ( + >=dev-libs/libxml2-2.4:2 + >=net-libs/loudmouth-1 + net-libs/libsoup:2.4 + net-libs/gnutls:= + ) + grammar? ( >=dev-libs/link-grammar-4.2.1 ) + math? ( >=x11-libs/gtkmathview-0.7.5 ) + ots? ( >=app-text/ots-0.5-r1 ) + readline? ( sys-libs/readline:0= ) + thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) + wordperfect? ( + app-text/libwpd:0.10 + app-text/libwpg:0.3 + ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + ) + redland? ( + >=dev-libs/redland-1.0.10 + >=dev-libs/rasqal-0.9.17 + ) + spell? ( app-text/enchant:2 ) + !=psiconv-0.9.4 + use readline && plugins+=(command) + use thesaurus && plugins+=(aiksaurus) + use wmf && plugins+=(wmf) + # wordperfect: >=wpd-0.9 >=wpg-0.2 + use wordperfect && plugins+=(wpg) + fi + + econf \ + --disable-maintainer-mode \ + --enable-plugins="${plugins[*]}" \ + --disable-static \ + --disable-default-plugins \ + --disable-builtin-plugins \ + --disable-collab-backend-telepathy \ + --enable-clipart \ + --enable-statusbar \ + --enable-templates \ + --with-gio \ + --without-gnomevfs \ + --without-gtk2 \ + $(use_enable debug) \ + $(use_with goffice goffice) \ + $(use_with calendar libical) \ + $(use_enable cups print) \ + $(use_enable collab collab-backend-xmpp) \ + $(use_enable collab collab-backend-tcp) \ + $(use_enable collab collab-backend-service) \ + $(use_with eds evolution-data-server) \ + $(use_enable introspection) \ + $(use_with map champlain) \ + $(use_with redland) \ + $(use_enable spell) +} + +src_install() { + default + + # no static archives + find "${D}" -name '*.la' -delete || die +} diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/app-office/abiword/abiword-3.0.5.ebuild deleted file mode 100644 index ff7b3097fd9b..000000000000 --- a/app-office/abiword/abiword-3.0.5.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg - -DESCRIPTION="Fully featured yet light and fast cross platform word processor" -HOMEPAGE="http://www.abisource.com/" -SRC_URI=" - http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz - https://dev.gentoo.org/~soap/distfiles/${PN}-3.0.4-patchset-r3.txz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus" -# You need 'plugins' enabled if want to enable the extra plugins -REQUIRED_USE=" - collab? ( plugins ) - grammar? ( plugins ) - latex? ( plugins ) - math? ( plugins ) - ots? ( plugins ) - readline? ( plugins ) - thesaurus? ( plugins ) - wordperfect? ( plugins ) - wmf? ( plugins )" - -RDEPEND=" - >=app-text/wv-1.2 - >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2.16:2 - >=dev-libs/libgcrypt-1.4.5:0= - dev-libs/libxslt - >=gnome-base/librsvg-2.16:2 - >=gnome-extra/libgsf-1.14.18:= - >=media-libs/libpng-1.2:0= - virtual/jpeg:0 - >=x11-libs/cairo-1.10 - >=x11-libs/gtk+-3.0.8:3[cups?] - calendar? ( >=dev-libs/libical-0.46:= ) - eds? ( >=gnome-extra/evolution-data-server-3.6.0:= ) - goffice? ( >=x11-libs/goffice-0.10.2:0.10 ) - introspection? ( >=dev-libs/gobject-introspection-1.0.0:= ) - map? ( >=media-libs/libchamplain-0.12:0.12[gtk] ) - plugins? ( - collab? ( - >=dev-libs/libxml2-2.4:2 - >=net-libs/loudmouth-1 - net-libs/libsoup:2.4 - net-libs/gnutls:= - ) - grammar? ( >=dev-libs/link-grammar-4.2.1 ) - math? ( >=x11-libs/gtkmathview-0.7.5 ) - ots? ( >=app-text/ots-0.5-r1 ) - readline? ( sys-libs/readline:0= ) - thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) - wordperfect? ( - app-text/libwpd:0.10 - app-text/libwpg:0.3 - ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - ) - redland? ( - >=dev-libs/redland-1.0.10 - >=dev-libs/rasqal-0.9.17 - ) - spell? ( app-text/enchant:2 ) - !=psiconv-0.9.4 - use readline && plugins+=(command) - use thesaurus && plugins+=(aiksaurus) - use wmf && plugins+=(wmf) - # wordperfect: >=wpd-0.9 >=wpg-0.2 - use wordperfect && plugins+=(wpg) - fi - - econf \ - --disable-maintainer-mode \ - --enable-plugins="${plugins[*]}" \ - --disable-static \ - --disable-default-plugins \ - --disable-builtin-plugins \ - --disable-collab-backend-telepathy \ - --enable-clipart \ - --enable-statusbar \ - --enable-templates \ - --with-gio \ - --without-gnomevfs \ - --without-gtk2 \ - $(use_enable debug) \ - $(use_with goffice goffice) \ - $(use_with calendar libical) \ - $(use_enable cups print) \ - $(use_enable collab collab-backend-xmpp) \ - $(use_enable collab collab-backend-tcp) \ - $(use_enable collab collab-backend-service) \ - $(use_with eds evolution-data-server) \ - $(use_enable introspection) \ - $(use_with map champlain) \ - $(use_with redland) \ - $(use_enable spell) -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} 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 -- cgit v1.2.3-65-gdbad