From a960a8aeffeafe7c7b0f181a5e1c039d25a64dc2 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Fri, 11 May 2018 18:33:55 -0300
Subject: [PATCH] XQilla: update to 2.3.4.

---
 common/shlibs           |  3 +--
 srcpkgs/XQilla/template | 37 +++++++++----------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d5b80999729..7b7d9c95849 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2340,7 +2340,6 @@ 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.3 libunibreak-4.0_1
 libgconfmm-2.6.so.1 gconfmm-2.28.3_1
@@ -2962,7 +2961,7 @@ libchipcard.so.6 libchipcard-5.0.4_1
 libraqm.so.0 libraqm-0.2.0_1
 liboggz.so.2 liboggz-1.1.1_1
 libfishsound.so.1 libfishsound-1.0.0_1
-libxqilla.so.3 XQilla-2.3.3_1
+libxqilla.so.2 XQilla-2.3.4_1
 libKF5DocTools.so.5 kdoctools-5.36.0_1
 libKF5MediaPlayer.so.5 kmediaplayer-5.36.0_1
 libbrotlicommon.so.1 brotli-1.0.2_1
diff --git a/srcpkgs/XQilla/template b/srcpkgs/XQilla/template
index 3b4c80776ab..d5e146d53f6 100644
--- a/srcpkgs/XQilla/template
+++ b/srcpkgs/XQilla/template
@@ -1,43 +1,24 @@
 # Template file for 'XQilla'
 pkgname=XQilla
-version=2.3.3
-revision=3
-_xercesc_ver=3.1.4
+version=2.3.4
+revision=1
 build_style=gnu-configure
-configure_args="--with-xerces=${XBPS_BUILDDIR}/xerces-c-${_xercesc_ver}"
+hostmakedepends="flex"
+configure_args="--with-xerces=${XBPS_CROSS_BASE}/usr"
+makedepends="libxerces-c-devel"
 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
- http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${_xercesc_ver}.tar.bz2"
-checksum="8f76b9b4f966f315acc2a8e104e426d8a76ba4ea3441b0ecfdd1e39195674fd6
- 9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8cc6891"
-
-pre_configure() {
-	local _args="--prefix=/usr --disable-shared"
-
-	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} CPPFLAGS="-fPIC ${CPPFLAGS}"
-	make ${makejobs}
-
-	# Back to XQilla
-	cd ${wrksrc}
-	sed -i "/^LDFLAGS/s:$: $LDFLAGS:" Makefile.in
-}
+distfiles="${SOURCEFORGE_SITE}/xqilla/XQilla-${version}.tar.gz"
+checksum=adfd4df011fcda08be3f51771006da23e852bac81e2fe63159beddc3633b3f55
 
 XQilla-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
-	conflicts="xerces-c-devel>=0"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/libxqilla*.so
-		vmove usr/lib/libxqilla*.a
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }