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