diff --git a/srcpkgs/xapian-core/patches/musl.patch b/srcpkgs/xapian-core/patches/musl.patch new file mode 100644 index 00000000000..fac2c02823e --- /dev/null +++ b/srcpkgs/xapian-core/patches/musl.patch @@ -0,0 +1,10 @@ +--- common/socket_utils.cc.orig ++++ common/socket_utils.cc +@@ -28,6 +28,7 @@ using namespace std; + + #ifndef __WIN32__ + # include ++# include + #else + # include "safeerrno.h" + diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template index 86e4045a261..bf1c3f4331e 100644 --- a/srcpkgs/xapian-core/template +++ b/srcpkgs/xapian-core/template @@ -1,7 +1,7 @@ # Template file for 'xapian-core' pkgname=xapian-core -version=1.2.21 -revision=2 +version=1.2.22 +revision=1 build_style=gnu-configure configure_args="--disable-static" makedepends="zlib-devel libuuid-devel" @@ -10,15 +10,11 @@ maintainer="Juan RP " homepage="http://www.xapian.org/" license="GPL-2" distfiles="http://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz" -checksum=63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f +checksum=269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f # xapian-config needs the .la keep_libtool_archives=yes -pre_configure() { - sed -i '//a#include ' common/socket_utils.cc -} - xapian-core-devel_package() { depends="libxapian-${version}_${revision}" short_desc+=" - development files" @@ -27,6 +23,7 @@ xapian-core-devel_package() { vmove usr/share/doc vmove usr/share/aclocal vmove usr/lib/cmake + vmove usr/lib/pkgconfig vmove usr/lib/*.la vmove usr/lib/*.so vmove usr/bin/xapian-config