Skip to content

Commit

Permalink
dev-libs/xqilla: version bump to 2.3.4
Browse files Browse the repository at this point in the history
Also, depend on app-text/tidy-html5 instead of app-text/htmltidy

Signed-off-by: Jouni Kosonen <jouni.kosonen@tukesoft.com>
Closes: https://bugs.gentoo.org/672886
Closes: https://bugs.gentoo.org/671442
  • Loading branch information
jok-ts committed Apr 21, 2019
1 parent 3ba9225 commit 716dcd4
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 0 deletions.
1 change: 1 addition & 0 deletions dev-libs/xqilla/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST XQilla-2.3.3.tar.gz 16170903 BLAKE2B fb88f507e77a248009a4eabb74e923849e55e4d3e716e95e0c25fc115aa9f72994b0e6dd1332529531bc59c34773e6a58ab1cd4459f19109da2dc8a348261ea2 SHA512 5a27416eaf1d7120c42dbd5c737e112954d4e3782de5ff4c77e29f1bcd1a5712cdc5a76f707d9c3323526a361e46df98d8ee1ca87c760d389d85598a8265054f
DIST XQilla-2.3.4.tar.gz 15439591 BLAKE2B 5ebb719823019552dd81f9bba7325e41626afaeca577f19c4b3ace04daf68fd4cfae2feb3bccffaad5fcb21bbce7acb32359613ea93ee33e97171dcdb1b5b53e SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994
13 changes: 13 additions & 0 deletions dev-libs/xqilla/files/xqilla-2.3.4-tidy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/functions/FunctionParseHTML.cpp b/src/functions/FunctionParseHTML.cpp
index 833d997..920895d 100644
--- a/src/functions/FunctionParseHTML.cpp
+++ b/src/functions/FunctionParseHTML.cpp
@@ -30,7 +30,7 @@

#ifdef HAVE_LIBTIDY
#include <tidy.h>
-#include <buffio.h>
+#include <tidybuffio.h>
#endif

#include <xercesc/util/XMLString.hpp>
70 changes: 70 additions & 0 deletions dev-libs/xqilla/xqilla-2.3.4.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6

inherit autotools

MY_P="XQilla-${PV}"

DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C++"
HOMEPAGE="http://xqilla.sourceforge.net/HomePage"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0/2"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples faxpp static-libs tidy"

# XQilla bundles two libraries:
# - mapm, heavily patched
# - yajl, moderately patched
# There's currently no way to unbundle those

RDEPEND=">=dev-libs/xerces-c-3.2.2
faxpp? ( dev-libs/faxpp )
tidy? ( app-text/tidy-html5 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"

PATCHES=(
"${FILESDIR}/2.2.4-respect-ldflags-no-rpath.patch"
"${FILESDIR}/${P}-tidy.patch"
)

S="${WORKDIR}/${MY_P}"

src_prepare() {
default
mv configure.{in,ac} || die
eautoreconf
}

src_configure() {
econf \
--with-xerces="${EPREFIX}"/usr \
$(use_enable debug) \
$(use_with tidy tidy /usr) \
$(use_with faxpp faxpp /usr) \
$(use_enable static-libs static)
}

src_compile() {
default
use doc && emake docs devdocs
}

src_install () {
use doc && local HTML_DOCS=( docs/{dev-api,dom3-api,simple-api} )
default

find "${D}" -name '*.la' -delete || die

if use examples; then
docinto examples
dodoc -r "${S}"/src/samples/.
fi

# remove unnecessary files previously filtered by dohtml
find "${ED%/}/usr/share/doc/${PF}" \
\( -name '*.map' -o -name '*.md5' \) -delete || die
}

0 comments on commit 716dcd4

Please sign in to comment.