From bac9cef91b6906157eb3d25da723754c8cd4f6e2 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 8 Oct 2016 06:35:47 +0200 Subject: [PATCH 1/5] xapian-core: update to 1.4.0. (soname bump) --- common/shlibs | 2 +- srcpkgs/xapian-core/patches/musl.patch | 10 ---------- srcpkgs/xapian-core/template | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/xapian-core/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index e45bd28e295..6f8a7b52cf8 100644 --- a/common/shlibs +++ b/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 diff --git a/srcpkgs/xapian-core/patches/musl.patch b/srcpkgs/xapian-core/patches/musl.patch deleted file mode 100644 index fac2c02823e..00000000000 --- a/srcpkgs/xapian-core/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 99904e368fa..5f42b601229 100644 --- a/srcpkgs/xapian-core/template +++ b/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 " 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 From e22abe5b8ac504c8d8ff7ec46aa566b6823824f1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 8 Oct 2016 06:37:32 +0200 Subject: [PATCH 2/5] baloo: rebuild against xapian-core-1.4.0 --- srcpkgs/baloo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo/template b/srcpkgs/baloo/template index 4a592e30bd6..102eadf66e3 100644 --- a/srcpkgs/baloo/template +++ b/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 " -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 From fb188898568bb2d1df0a135085cb9a12f86e653e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 8 Oct 2016 06:37:32 +0200 Subject: [PATCH 3/5] mu: rebuild against xapian-core-1.4.0 --- srcpkgs/mu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template index 1bd87dec0a5..523a69a29ba 100644 --- a/srcpkgs/mu/template +++ b/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" From b8c14f915c0f7c25b4b10a5db240e31686a4bfaf Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 8 Oct 2016 06:45:34 +0200 Subject: [PATCH 4/5] notmuch: update to 0.23. --- srcpkgs/notmuch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index 5616f2d07e7..78204d5dcb5 100644 --- a/srcpkgs/notmuch/template +++ b/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. " 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" From 97d6d1bdbf12c350a2752d9ecd0145ca479061a6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 8 Oct 2016 06:37:32 +0200 Subject: [PATCH 5/5] zeitgeist: rebuild against xapian-core-1.4.0 --- srcpkgs/zeitgeist/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 5c32587c770..63b824ba61f 100644 --- a/srcpkgs/zeitgeist/template +++ b/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)"