From 05352c62f68abe91a554b2964bf635aba2a5269e Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 12 Feb 2023 04:33:30 -0600 Subject: user/sword: Update to 1.9.0, fix tests, use Xapian * Tests were not actually being run. Fix that. * Port away from CLucene, which is broken on multiple architectures, to the Xapian full-text search (FTS) engine. See #873. --- user/sword/APKBUILD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'user/sword') diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD index ca43371fa..f436941ec 100644 --- a/user/sword/APKBUILD +++ b/user/sword/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=sword -pkgver=1.8.1 +pkgver=1.9.0 pkgrel=0 pkgdesc="Cross-platform library for accessing and searching OSIS books" url="http://www.crosswire.org/sword/index.jsp" arch="all" license="GPL-2.0-only AND LGPL-2.1+ AND zlib" depends="" -makedepends="clucene-dev curl-dev icu-dev zlib-dev" +makedepends="curl-dev icu-dev xapian-core-dev zlib-dev" subpackages="$pkgname-dev" -source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz" +source="http://crosswire.org/ftpmirror/pub/sword/source/v${pkgver%.*}/sword-$pkgver.tar.gz" build() { CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./configure \ @@ -25,6 +25,11 @@ build() { check() { make check + # These tests don't work on musl because argv[0] is a full path. + for skiptest in basic mod2zmod osis2modcipher; do + rm tests/testsuite/osis_${skiptest}.good; + done + make -C tests/testsuite run } package() { @@ -32,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install_config } -sha512sums="5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 sword-1.8.1.tar.gz" +sha512sums="9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f sword-1.9.0.tar.gz" -- cgit v1.2.3-60-g2f50