From a2abdbab85869e2d2a2f21975314ce925cebe9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 1 Sep 2017 21:02:12 +0200
Subject: [PATCH] XQilla: embed xerces-c-3.1.4

Since XQilla does not build with xerces-c >= 3.2.0 yet, embed the obsolete
xerces-c-3.1.4 into the XQilla build. The xerces-c-3.1.4 binaries got a "31"
suffix to avoid conflicts with those from xerces-c package.

Drop the dependency on xerces-c-devel.

The XQilla-devel package however now needs to conflict with xerces-c-devel,
because the library files libxerces-c.a, libxerces-c.so and the header
files in /usr/include/xercesc are in the sample place.
---
 common/shlibs           |  1 +
 srcpkgs/XQilla/template | 34 ++++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d05d9fe5d5f..7af5d18a0e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2253,6 +2253,7 @@ libfloatfann.so.2 fann-2.2.0_1
 libfixedfann.so.2 fann-2.2.0_1
 libfann.so.2 fann-2.2.0_1
 libdoublefann.so.2 fann-2.2.0_1
+libxerces-c-3.1.so XQilla-2.3.3_2
 libxerces-c-3.2.so libxerces-c-3.2.0_1
 libunibreak.so.1 libunibreak-1.0_1
 libgconfmm-2.6.so.1 gconfmm-2.28.3_1
diff --git a/srcpkgs/XQilla/template b/srcpkgs/XQilla/template
index 020560fd12c..60332880a23 100644
--- a/srcpkgs/XQilla/template
+++ b/srcpkgs/XQilla/template
@@ -2,28 +2,46 @@
 pkgname=XQilla
 version=2.3.3
 revision=2
+_xercesc_ver=3.1.4
 build_style=gnu-configure
-configure_args="--with-xerces=${XBPS_CROSS_BASE}/usr"
-makedepends="libxerces-c-devel"
+configure_args="--with-xerces=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr"
 short_desc="XQuery and XPath2 library and command line utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://xqilla.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/xqilla/${pkgname}-${version}.tar.gz"
-checksum=8f76b9b4f966f315acc2a8e104e426d8a76ba4ea3441b0ecfdd1e39195674fd6
-
-broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/4584/steps/shell_3/logs/stdio"
+distfiles="${SOURCEFORGE_SITE}/xqilla/${pkgname}-${version}.tar.gz
+ http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${_xercesc_ver}.tar.bz2"
+checksum="8f76b9b4f966f315acc2a8e104e426d8a76ba4ea3441b0ecfdd1e39195674fd6
+ 9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8cc6891"
 
 pre_configure() {
+	local _args="--prefix=/usr --program-suffix=31"
+
+	msg_normal "Building xerces-c-${_xercesc_ver} on the fly ..."
+	cd ${XBPS_BUILDDIR}/xerces-c-${_xercesc_ver}
+
+	if [ -n "$CROSS_BUILD" ]; then
+		_args+=" --host=${XBPS_CROSS_TRIPLET}"
+	fi
+	./configure ${_args}
+	make ${makejobs}
+	make DESTDIR="${DESTDIR}" install
+
+	# Back to XQilla
+	cd ${wrksrc}
 	sed -i "/^LDFLAGS/s:$: $LDFLAGS:" Makefile.in
 }
 
 XQilla-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="xerces-c-devel>=0"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libxqilla*.so
+		vmove usr/lib/libxqilla*.a
+		vmove usr/lib/libxerces-c.a
+		vmove usr/lib/libxerces-c.so
 	}
 }