Merge pull request #4915 from ebfe/xapian

xapian-core: update to 1.4.0. (soname bump)

common/shlibs

@@ -1109,7 +1109,7 @@ libgweather-3.so.6 libgweather-3.10.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
-libxapian.so.22 libxapian-1.2.12_1
+libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
 libgdm.so.1 libgdm-3.6.0_1

srcpkgs/baloo/template

@@ -1,7 +1,7 @@
 # Template file for 'baloo'
 pkgname=baloo
 version=4.14.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF"
 hostmakedepends="cmake automoc4 pkg-config"
@@ -11,7 +11,7 @@ makedepends="zlib-devel libressl-devel qt-devel phonon-devel kdelibs-devel
 depends="hicolor-icon-theme"
 short_desc="A framework for searching and managing metadata"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL, LGPL, FDL"
+license="GPL-2, LGPL-2.1, FDL"
 homepage="https://projects.kde.org/projects/kde/kdelibs/baloo"
 distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=9edcd2bf9fcb4f42959087c954e533bf3345d0971b7402f04c0703c1b2e66a5c

srcpkgs/mu/template

@@ -1,7 +1,7 @@
 # Template build file for 'mu'.
 pkgname=mu
 version=0.9.16
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config emacs texinfo"
 makedepends="xapian-core-devel gmime-devel libuuid-devel"

srcpkgs/notmuch/template

@@ -1,6 +1,6 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.22.2
+version=0.23
 revision=1
 hostmakedepends="pkg-config perl python-Sphinx"
 makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion"
@@ -9,7 +9,7 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3"
 homepage="http://notmuchmail.org"
 distfiles="http://http.debian.net/debian/pool/main/n/notmuch/notmuch_${version}.orig.tar.gz"
-checksum=6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1
+checksum=c5e75b658ee2b58c5ac7a79e34d2449d37ddfa5c9e67a736454ec296c9a0a1b8
 
 nocross="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6341/steps/shell_3/logs/stdio"
 

srcpkgs/xapian-core/patches/musl.patch

@@ -1,10 +0,0 @@
---- common/socket_utils.cc.orig
-+++ common/socket_utils.cc
-@@ -28,6 +28,7 @@ using namespace std;
- 
- #ifndef __WIN32__
- # include <sys/socket.h>
-+# include <sys/time.h>
- #else
- # include "safeerrno.h"
- 

srcpkgs/xapian-core/template

@@ -1,6 +1,6 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
-version=1.2.23
+version=1.4.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.xapian.org/"
 license="GPL-2"
 distfiles="http://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
-checksum=9783aeae4e1a6d06e5636b270db4b458a7d0804a31da158269f57fa5dc86347d
+checksum=10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477
 
 # xapian-config needs the .la
 keep_libtool_archives=yes

srcpkgs/zeitgeist/template

@@ -1,7 +1,7 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
 version=0.9.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool vala-devel $(vopt_if gir gobject-introspection)"