gentoo resync : 14.08.2021

3 files changed, 155 insertions, 0 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index ecad19b431b5..32085abea2fb 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,6 +1,9 @@
+AUX 2.3.6-sqlite-3.34-compat.patch 2204 BLAKE2B 1b7602fee14de9c4ec2ca9dc55bf9b92a6f5f08fab5984184ac158fbde4537cb55f396e2b017b86f32e36a01c04c82f0c58946ffa0d2ce1025ae823f5788607a SHA512 3112fa20d4a8aacd008b0b5430b33329fcfbd2e3de886537cbde91c4f55fbaa5d254fefbd8f26a4e19824262d87e86b73c2192b1f5bde764ae8f182ac5ee9675
 AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
+DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.1.2.tar.xz 1429356 BLAKE2B 2401ee4d73aef29a40ff9c9f917fdf4709884bc26b7e8c5ae52b0e009bfd1934a122a78adea2fe6950480f4ccacb89d11388b4553bd4c0c68f5738118d34d3a1 SHA512 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
 EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
+EBUILD tracker-2.3.6.ebuild 2688 BLAKE2B 2d4c39b06f1522ff19eecc76067059c9e2b8357ad0509d041eb552b3ac4bb7574d5b9cd40a42c4008057d04e1eb1191be34e75ee4c5aec77a79f663db8b7d2e8 SHA512 7faaf2e2b27b5d4913cab3b58dfdda538d6a2f74e602844e952d4e59bd99e76d49f102e2cbf1073664d8653b2b9694749807c217975aea130da72cd5e741ca37
 EBUILD tracker-3.1.2.ebuild 2513 BLAKE2B 76f03a1250b2997419d6df2a207078eba08f011b7b026c141fc01d5d4b966aa000ef9b762da1ca253f7d1f972b30697390b07271e0c5a1a4ca8ed0524672f110 SHA512 9f377223909a43993fb091e16153159996b62e6e0ad8669da6b5519efa3c5d5227aa30322b11b7a431cfd5efb077075a8afdb645ef302c2278711e95df4c367b
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
new file mode 100644
index 000000000000..cdbfe2f6136e
--- /dev/null
+++ b/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
@@ -0,0 +1,45 @@
+From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Thu, 10 Dec 2020 03:55:08 +0100
+Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
+
+Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
+rows being deleted have actually some content before proceeding to deletion,
+and ensure we don't process individual properties one by one in the course
+of a whole rdfs:Resource deletion.
+
+Fixes: https://bugs.archlinux.org/task/68903
+---
+ src/libtracker-data/tracker-data-update.c         | 1 +
+ src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
+index e2f46685e..19cae25f9 100644
+--- a/src/libtracker-data/tracker-data-update.c
++++ b/src/libtracker-data/tracker-data-update.c
+@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
+ 		    g_hash_table_size (data->resource_buffer->tables) == 0) {
+ #if HAVE_TRACKER_FTS
+ 			tracker_db_interface_sqlite_fts_delete_id (iface, data->resource_buffer->id);
++			data->resource_buffer->fts_updated = TRUE;
+ #endif
+ 			/* skip subclass query when deleting whole resource
+ 			   to improve performance */
+diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
+index da88080ed..cdeb960e7 100644
+--- a/src/libtracker-data/tracker-db-interface-sqlite.c
++++ b/src/libtracker-data/tracker-db-interface-sqlite.c
+@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query (TrackerDBInterface *db_
+ 	g_string_append_printf (insert_str,
+ 	                        "INSERT INTO fts5 (fts5, rowid %s) "
+ 	                        "SELECT 'delete', rowid %s FROM fts_view "
+-	                        "WHERE rowid = ?",
++	                        "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT NULL",
++	                        db_interface->fts_properties,
+ 	                        db_interface->fts_properties,
+ 	                        db_interface->fts_properties);
+ 	return g_string_free (insert_str, FALSE);
+-- 
+2.32.0
+
diff --git a/app-misc/tracker/tracker-2.3.6.ebuild b/app-misc/tracker/tracker-2.3.6.ebuild
new file mode 100644
index 000000000000..66c91276a490
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0"
+IUSE="gtk-doc +miners networkmanager stemmer"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.0
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.20.0
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	$(vala_depend)
+	gtk-doc? ( >=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-sqlite-3.34-compat.patch # From upstream tracker-2.3 branch
+)
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dfts=true
+		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+		#$(meson_use test functional_tests)
+		-Dman=true
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion="$(get_bashcompdir)"
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}