tracker: merge with tracker3

* fix tests

common/shlibs

@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3111,10 +3109,7 @@ libykclient.so.3 ykclient-2.15_1
 libbooster.so.0 cppcms-1.0.5_1
 libcppcms.so.1 cppcms-1.0.5_1
 libcppdb.so.0 cppdb-0.3.1_1
-libtracker-control-2.0.so.0 libtracker-2.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
 libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1

srcpkgs/libtracker3

@@ -1 +1 @@
-tracker3
+tracker

srcpkgs/tracker/patches/failing-test-musl.patch

@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-

srcpkgs/tracker/template

@@ -1,23 +1,23 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
+version=3.2.1
-revision=3
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
+ -Dsystemd_user_services=false"
- -Dsystemd_user_services=no"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
-hostmakedepends="gettext pkg-config glib-devel vala"
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
- bash-completion"
+checkdepends="dbus tar python3-gobject"
-checkdepends="tar"
 short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +31,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +44,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}

srcpkgs/tracker/update

@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"

srcpkgs/tracker3

@@ -0,0 +1 @@
+tracker

srcpkgs/tracker3-devel

@@ -1 +1 @@
-tracker3
+tracker

srcpkgs/tracker3/template

@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}

srcpkgs/tracker3/update

@@ -1 +0,0 @@
-pkgname=tracker