commit: aedf9ae81c24986e8aeb06c5921acb55433bcbff Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Jul 21 11:40:18 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 11:45:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedf9ae8
app-misc/tracker: Remove slot :0 Bug: https://bugs.gentoo.org/846617 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> app-misc/tracker/Manifest | 1 - .../tracker/files/2.3.6-sqlite-3.34-compat.patch | 45 --------- app-misc/tracker/tracker-2.3.6-r1.ebuild | 107 --------------------- 3 files changed, 153 deletions(-) diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index 645f02651591..0c8d3f1a159c 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,3 +1,2 @@ -DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e DIST tracker-3.3.1.tar.xz 1976268 BLAKE2B 34492aac5c7a5cae20cc3b246de7a7f9948be05356508cffeec56cd6aa83b89a875c01d58c299299723e1aed8bba55d641dc817f77cecbe1379b49ea853aa8b3 SHA512 34a86ac58bf8b31f3beb106d3f8db38b764624b800f4cb1c015102f02616e4c2d356f58f0e6a13f66cca79a4173828748ad5e4217b21e83b2fe1606ddcd7ce88 DIST tracker-3.3.2.tar.xz 1977512 BLAKE2B 92d8db9ad33b019f47194f086379e1f9370d9ce3643a2a2dc02d277be755e5a892ab4c6bead8c2d50db642aca37141c9961d2fd1f862be57a6e0f78b479eb03f SHA512 2009c7a9b82fd278e38bc71cb41ef1fccb23493bd84a71456c7568ed7a025ce68bab689b8f14b8008479a203a5fdc02acea1862f4f482467ed5c295bde3d4ad8 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 deleted file mode 100644 index cdbfe2f6136e..000000000000 --- a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carl...@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-r1.ebuild b/app-misc/tracker/tracker-2.3.6-r1.ebuild deleted file mode 100644 index 00c45d75bcc8..000000000000 --- a/app-misc/tracker/tracker-2.3.6-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -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 ~riscv ~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 -}
