summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-05-30 01:49:29 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-08-07 10:08:13 -0500
commit2b75ae66033eaa344519cc6c5cde86230889be21 (patch)
tree3487bd3bd91904e4968a3be53cc58fe6d827ded0 /user
parent9d03e34dec850c50d2593ead44ca8eed281b46a4 (diff)
downloadpackages-2b75ae66033eaa344519cc6c5cde86230889be21.tar.gz
packages-2b75ae66033eaa344519cc6c5cde86230889be21.tar.bz2
packages-2b75ae66033eaa344519cc6c5cde86230889be21.tar.xz
packages-2b75ae66033eaa344519cc6c5cde86230889be21.zip
user/xapian-core: Update to 1.4.25
Finally fixed the test suite, too!
Diffstat (limited to 'user')
-rw-r--r--user/xapian-core/APKBUILD9
-rw-r--r--user/xapian-core/sortable-serialise.patch15
2 files changed, 20 insertions, 4 deletions
diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD
index 85f8f8f89..54298c775 100644
--- a/user/xapian-core/APKBUILD
+++ b/user/xapian-core/APKBUILD
@@ -1,18 +1,18 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer:
pkgname=xapian-core
-pkgver=1.4.17
+pkgver=1.4.25
pkgrel=0
pkgdesc="Open source search engine library"
url="https://xapian.org/"
arch="all"
-options="!check" # sortableserialise1 is still broken
license="GPL-2.0+"
depends=""
depends_dev="zlib-dev util-linux-dev"
makedepends="$depends_dev libtool"
subpackages="$pkgname-dev $pkgname-doc libxapian"
-source="http://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz
+source="https://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz
+ sortable-serialise.patch
timeval-t.patch
"
@@ -46,5 +46,6 @@ libxapian() {
mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib
}
-sha512sums="3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 xapian-core-1.4.17.tar.xz
+sha512sums="e8069f2cb75554978716a99580fb57fc73bbdd607c82394f53d07205d8c78fb59265004be0c676a6806bb2840a3933499dfc867e36a28855278569a0676d469d xapian-core-1.4.25.tar.xz
+d5c6dac118b96ed66ce7d01c0d8c41b4765397e56fec5ea64cd1d223e4d152c9bb9171bbd8bd804d1285103850ae8a1d21fe137e906da94c42b421b0e6e2a49a sortable-serialise.patch
639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch"
diff --git a/user/xapian-core/sortable-serialise.patch b/user/xapian-core/sortable-serialise.patch
new file mode 100644
index 000000000..d7cb9209a
--- /dev/null
+++ b/user/xapian-core/sortable-serialise.patch
@@ -0,0 +1,15 @@
+Discussing with upstream, but for now, this does fix both the test suite
+and operationally the ability to serialise +Inf values.
+--- xapian-core-1.4.25/api/sortable-serialise.cc.old 2024-03-07 16:57:54.000000000 -0600
++++ xapian-core-1.4.25/api/sortable-serialise.cc 2024-05-30 00:49:54.835053392 -0500
+@@ -55,6 +55,10 @@
+
+ // Negative infinity.
+ if (value < -DBL_MAX) return 0;
++ if (value == HUGE_VAL) {
++ memset(buf, '\xff', 9);
++ return 9;
++ }
+
+ mantissa = frexp(value, &exponent);
+