1 |
commit: fe6bac8296ebbf1da3f8bdb366f47ed4229fa163 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 14:13:09 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 14:14:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6bac82 |
7 |
|
8 |
app-misc/tracker: fix database upgrade from tracker-1 |
9 |
|
10 |
Without the added patch tracker-store actually fails to upgrade |
11 |
the database from tracker-1 times to tracker-2 and exits, thus |
12 |
for users that had used tracker-1 already tracker-2 wouldn't |
13 |
actually work at all. This patch fixes it for me at least. |
14 |
This might only be a problem when upgrading from tracker-1 only |
15 |
now, while having sqlite at v3.25 or newer, but this will be the |
16 |
case for only main tree users. |
17 |
|
18 |
Bug: https://bugs.gentoo.org/672308 |
19 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
20 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
21 |
|
22 |
.../tracker/files/2.1.7-upgrade-path-fix.patch | 33 ++++++++++++++++++++++ |
23 |
...racker-2.1.7.ebuild => tracker-2.1.7-r1.ebuild} | 1 + |
24 |
2 files changed, 34 insertions(+) |
25 |
|
26 |
diff --git a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..a1fa32738d8 |
29 |
--- /dev/null |
30 |
+++ b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch |
31 |
@@ -0,0 +1,33 @@ |
32 |
+From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001 |
33 |
+From: Carlos Garnacho <carlosg@×××××.org> |
34 |
+Date: Mon, 17 Dec 2018 13:34:23 +0100 |
35 |
+Subject: [PATCH] libtracker-data: Update FTS if base tables were altered |
36 |
+ |
37 |
+That will issue an update of all tables, so the FTS view might be |
38 |
+affected. This is not caught by ontology change tests, as this |
39 |
+is a situation that can only happen when migrating from 1.x databases |
40 |
+ATM. |
41 |
+ |
42 |
+(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144) |
43 |
+--- |
44 |
+ src/libtracker-data/tracker-data-manager.c | 4 ++-- |
45 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
46 |
+ |
47 |
+diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c |
48 |
+index f2addd0df..05a96b4dd 100644 |
49 |
+--- a/src/libtracker-data/tracker-data-manager.c |
50 |
++++ b/src/libtracker-data/tracker-data-manager.c |
51 |
+@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager *manager, |
52 |
+ } |
53 |
+ |
54 |
+ #if HAVE_TRACKER_FTS |
55 |
+- if (in_update) { |
56 |
+- update_fts = tracker_data_manager_fts_changed (manager); |
57 |
++ if (base_tables_altered || in_update) { |
58 |
++ update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager); |
59 |
+ |
60 |
+ if (update_fts) |
61 |
+ tracker_db_interface_sqlite_fts_delete_table (iface); |
62 |
+-- |
63 |
+2.17.0 |
64 |
+ |
65 |
|
66 |
diff --git a/app-misc/tracker/tracker-2.1.7.ebuild b/app-misc/tracker/tracker-2.1.7-r1.ebuild |
67 |
similarity index 98% |
68 |
rename from app-misc/tracker/tracker-2.1.7.ebuild |
69 |
rename to app-misc/tracker/tracker-2.1.7-r1.ebuild |
70 |
index 24923cfd409..c9232427a4b 100644 |
71 |
--- a/app-misc/tracker/tracker-2.1.7.ebuild |
72 |
+++ b/app-misc/tracker/tracker-2.1.7-r1.ebuild |
73 |
@@ -52,6 +52,7 @@ PATCHES=( |
74 |
"${FILESDIR}"/${PV}-prevent-stack-smashing.patch |
75 |
"${FILESDIR}"/${PV}-glib-2.60-compat.patch |
76 |
"${FILESDIR}"/${PV}-fix-library-symlinks.patch |
77 |
+ "${FILESDIR}"/${PV}-upgrade-path-fix.patch |
78 |
) |
79 |
|
80 |
function inotify_enabled() { |