Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/files/, app-misc/tracker/
Date: Sun, 27 Mar 2022 05:07:44
Message-Id: 1648357616.ed7171c7c2411f6add10beba7534e814dab5c413.mattst88@gentoo
1 commit: ed7171c7c2411f6add10beba7534e814dab5c413
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 05:06:56 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 05:06:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7171c7
7
8 app-misc/tracker: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 app-misc/tracker/Manifest | 1 -
13 .../tracker/files/2.3.6-sqlite-3.34-compat.patch | 45 ---------
14 app-misc/tracker/tracker-2.3.6-r1.ebuild | 107 ---------------------
15 3 files changed, 153 deletions(-)
16
17 diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
18 index 0273c2755643..a9daf6b37ad5 100644
19 --- a/app-misc/tracker/Manifest
20 +++ b/app-misc/tracker/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
23 DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 9095a457157cd2bedfd34b01afc9fd832af0a5c57c6ba5b9c00175f382b70135e20437d6fd2ca9cc06df28634627e487536b15548f2c5d54c68297f26f06447b SHA512 3e8f33de0f77d45af2ed82e8fd216d6fb4c3aa080648cf490bdaef233fac1c635e10660ac0bfcdf0a43af48d454e0d4d7c04cb650f5f89660e8e4efc10104f56
24 DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908 SHA512 0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc
25
26 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
27 deleted file mode 100644
28 index cdbfe2f6136e..000000000000
29 --- a/app-misc/tracker/files/2.3.6-sqlite-3.34-compat.patch
30 +++ /dev/null
31 @@ -1,45 +0,0 @@
32 -From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
33 -From: Carlos Garnacho <carlosg@×××××.org>
34 -Date: Thu, 10 Dec 2020 03:55:08 +0100
35 -Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table
36 -
37 -Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
38 -rows being deleted have actually some content before proceeding to deletion,
39 -and ensure we don't process individual properties one by one in the course
40 -of a whole rdfs:Resource deletion.
41 -
42 -Fixes: https://bugs.archlinux.org/task/68903
43 ----
44 - src/libtracker-data/tracker-data-update.c | 1 +
45 - src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
46 - 2 files changed, 3 insertions(+), 1 deletion(-)
47 -
48 -diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
49 -index e2f46685e..19cae25f9 100644
50 ---- a/src/libtracker-data/tracker-data-update.c
51 -+++ b/src/libtracker-data/tracker-data-update.c
52 -@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData *data,
53 - g_hash_table_size (data->resource_buffer->tables) == 0) {
54 - #if HAVE_TRACKER_FTS
55 - tracker_db_interface_sqlite_fts_delete_id (iface, data->resource_buffer->id);
56 -+ data->resource_buffer->fts_updated = TRUE;
57 - #endif
58 - /* skip subclass query when deleting whole resource
59 - to improve performance */
60 -diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
61 -index da88080ed..cdeb960e7 100644
62 ---- a/src/libtracker-data/tracker-db-interface-sqlite.c
63 -+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
64 -@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query (TrackerDBInterface *db_
65 - g_string_append_printf (insert_str,
66 - "INSERT INTO fts5 (fts5, rowid %s) "
67 - "SELECT 'delete', rowid %s FROM fts_view "
68 -- "WHERE rowid = ?",
69 -+ "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT NULL",
70 -+ db_interface->fts_properties,
71 - db_interface->fts_properties,
72 - db_interface->fts_properties);
73 - return g_string_free (insert_str, FALSE);
74 ---
75 -2.32.0
76 -
77
78 diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild b/app-misc/tracker/tracker-2.3.6-r1.ebuild
79 deleted file mode 100644
80 index cfaa81da0bab..000000000000
81 --- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
82 +++ /dev/null
83 @@ -1,107 +0,0 @@
84 -# Copyright 1999-2021 Gentoo Authors
85 -# Distributed under the terms of the GNU General Public License v2
86 -
87 -EAPI=7
88 -PYTHON_COMPAT=( python3_{7..9} )
89 -VALA_MIN_API_VERSION="0.40"
90 -
91 -inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
92 -
93 -DESCRIPTION="A tagging metadata database, search tool and indexer"
94 -HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
95 -
96 -LICENSE="GPL-2+ LGPL-2.1+"
97 -SLOT="0/2.0"
98 -IUSE="gtk-doc +miners networkmanager stemmer"
99 -
100 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
101 -#RESTRICT="!test? ( test )"
102 -
103 -PV_SERIES=$(ver_cut 1-2)
104 -
105 -# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
106 -# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
107 -RDEPEND="
108 - >=dev-libs/glib-2.46:2
109 - >=sys-apps/dbus-1.3.2
110 - >=dev-libs/gobject-introspection-1.54:=
111 - >=dev-libs/icu-4.8.1.2:=
112 - >=dev-libs/json-glib-1.0
113 - >=net-libs/libsoup-2.40.1:2.4
114 - >=dev-libs/libxml2-2.7
115 - >=dev-db/sqlite-3.20.0
116 - networkmanager? ( >=net-misc/networkmanager-0.8 )
117 - stemmer? ( dev-libs/snowball-stemmer:= )
118 - sys-apps/util-linux
119 -"
120 -DEPEND="${RDEPEND}"
121 -BDEPEND="
122 - dev-util/glib-utils
123 - $(vala_depend)
124 - gtk-doc? ( >=dev-util/gtk-doc-1.8
125 - app-text/docbook-xml-dtd:4.1.2
126 - app-text/docbook-xml-dtd:4.5 )
127 - >=sys-devel/gettext-0.19.8
128 - virtual/pkgconfig
129 - ${PYTHON_DEPS}
130 -"
131 -PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
132 -
133 -PATCHES=(
134 - "${FILESDIR}"/${PV}-sqlite-3.34-compat.patch # From upstream tracker-2.3 branch
135 -)
136 -
137 -function inotify_enabled() {
138 - if linux_config_exists; then
139 - if ! linux_chkconfig_present INOTIFY_USER; then
140 - ewarn "You should enable the INOTIFY support in your kernel."
141 - ewarn "Check the 'Inotify support for userland' under the 'File systems'"
142 - ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
143 - die 'missing CONFIG_INOTIFY'
144 - fi
145 - else
146 - einfo "Could not check for INOTIFY support in your kernel."
147 - fi
148 -}
149 -
150 -pkg_setup() {
151 - linux-info_pkg_setup
152 - inotify_enabled
153 -
154 - python-any-r1_pkg_setup
155 -}
156 -
157 -src_prepare() {
158 - xdg_src_prepare
159 - vala_src_prepare
160 -}
161 -
162 -src_configure() {
163 - local emesonargs=(
164 - $(meson_use gtk-doc docs)
165 - -Dfts=true
166 - -Dfunctional_tests=false # many fail in 2.2; retry with 2.3
167 - #$(meson_use test functional_tests)
168 - -Dman=true
169 - $(meson_feature networkmanager network_manager)
170 - $(meson_feature stemmer)
171 - -Dunicode_support=icu
172 - -Dbash_completion="$(get_bashcompdir)"
173 - -Dsystemd_user_services="$(systemd_get_userunitdir)"
174 - )
175 - meson_src_configure
176 -}
177 -
178 -src_test() {
179 - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
180 -}
181 -
182 -pkg_postinst() {
183 - xdg_pkg_postinst
184 - gnome2_schemas_update
185 -}
186 -
187 -pkg_postrm() {
188 - xdg_pkg_postrm
189 - gnome2_schemas_update
190 -}