commit: 5bb6e1c7f4f630b6061307adfe2a5107d0eefb89 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Mon Feb 24 22:44:13 2025 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Mon Feb 24 22:50:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb6e1c7
app-text/docbook2X: Stop redeclaring predefined entity "<" Addresses annoying (but correct) warning output from libxml2 for every call to docbook2x-man. Please see the upstream bug report for details: https://sourceforge.net/p/docbook2x/bugs/25/ Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> app-text/docbook2X/docbook2X-0.8.8-r5.ebuild | 64 ++++++++++++++++++++++ ...8.8-stop-redeclaring-predefined-entity-lt.patch | 42 ++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild new file mode 100644 index 000000000000..cdf42519d9f5 --- /dev/null +++ b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tools to convert docbook to man and info" +HOMEPAGE="https://docbook2x.sourceforge.net/"; +SRC_URI="https://downloads.sourceforge.net/docbook2x/${P}.tar.gz"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos" +IUSE="test" + +RESTRICT="!test? ( test )" + +# dev-perl/XML-LibXML - although not mentioned upstream is required +# for make check to complete. +DEPEND="dev-lang/perl + dev-libs/libxslt + dev-perl/XML-NamespaceSupport + dev-perl/XML-SAX + dev-perl/XML-LibXML + app-text/docbook-xsl-stylesheets + =app-text/docbook-xml-dtd-4.2*" +RDEPEND="${DEPEND}" + +PATCHES=( + # Patches from debian, for description see patches itself. + "${FILESDIR}/${P}-filename_whitespace_handling.patch" + "${FILESDIR}/${P}-preprocessor_declaration_syntax.patch" + "${FILESDIR}/${P}-error_on_missing_refentry.patch" + # bug #296112 + "${FILESDIR}/${P}-drop-htmldir.patch" + # https://sourceforge.net/p/docbook2x/bugs/25/ + "${FILESDIR}/${P}-stop-redeclaring-predefined-entity-lt.patch" +) + +src_prepare() { + default + + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed' + + # bug #290284 + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-xslt-processor=libxslt + --program-transform-name='/^docbook2/s,$,.pl,' + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + dosym docbook2man.pl /usr/bin/docbook2x-man + dosym docbook2texi.pl /usr/bin/docbook2x-texi +} diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch b/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch new file mode 100644 index 000000000000..76463be75e27 --- /dev/null +++ b/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch @@ -0,0 +1,42 @@ +From 040f468fcfae3fe67818023ebc54f3f48fc1bfd9 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Mon, 24 Feb 2025 23:25:40 +0100 +Subject: [PATCH] Fix invalid redeclaration of predefined XML entity "<" + +Section "4.6 Predefined Entities" of XML 1.0r4 is clear that: + +> If the entities lt or amp are declared, they MUST be declared +> as internal entities whose replacement text is a character reference +> to the respective character (less-than sign or ampersand) being escaped[.] + +Source: +https://www.w3.org/TR/2006/REC-xml-20060816/#sec-predefined-ent +--- + xslt/common/text/l10n-set.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xslt/common/text/l10n-set.xml b/xslt/common/text/l10n-set.xml +index 0ed7454..b2c334b 100644 +--- a/xslt/common/text/l10n-set.xml ++++ b/xslt/common/text/l10n-set.xml +@@ -21,7 +21,7 @@ + <!ENTITY it SYSTEM "it.xml"> + <!ENTITY ja SYSTEM "ja.xml"> + <!ENTITY ko SYSTEM "ko.xml"> +-<!ENTITY lt SYSTEM "lt.xml"> ++<!ENTITY lt_ SYSTEM "lt.xml"> + <!ENTITY nl SYSTEM "nl.xml"> + <!ENTITY nn SYSTEM "nn.xml"> + <!ENTITY no SYSTEM "no.xml"> +@@ -65,7 +65,7 @@ + ⁢ + &ja; + &ko; +-< ++<_; + &nl; + &nn; + &no; +-- +2.48.1 +
