[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/, app-misc/tracker/files/

[Mart Raudsepp]

commit:     ac7095fad50859216bfa6aeae59b4569023612ec
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 01:23:51 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 01:24:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7095fa

app-misc/tracker: bump to 2.1.8

Merely includes 2 of the patches we had in 2.1.7-r1, and the
pregenerated C for vala code is generated with a different
valac version.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker/Manifest                          |   2 +-
 .../tracker/files/2.1.7-glib-2.60-compat.patch     | 169 ---------------------
 .../tracker/files/2.1.7-upgrade-path-fix.patch     |  33 ----
 ...7-doc-options.patch => 2.1.8-doc-options.patch} |   0
 ...inks.patch => 2.1.8-fix-library-symlinks.patch} |   0
 ...ng.patch => 2.1.8-prevent-stack-smashing.patch} |   0
 .../{2.1.7-test-fix.patch => 2.1.8-test-fix.patch} |   0
 ...racker-2.1.7-r1.ebuild => tracker-2.1.8.ebuild} |   2 -
 8 files changed, 1 insertion(+), 205 deletions(-)

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 228b9799606..deb8032cdd9 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,2 +1,2 @@
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0
+DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696

diff --git a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch b/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
deleted file mode 100644
index 93737f79857..00000000000
--- a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 43b10233d4cce38230c357d885662291d2e5e978 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iainl@×××××.org>
-Date: Mon, 11 Feb 2019 15:42:14 +0000
-Subject: [PATCH 4/5] libtracker-data: Don't rely on hash table iteration order
- being stable
-
-This is the same problem that was fixed by
-c58f7aa419e2c3a69fa7fe583a1fd5e0b9bd0839 on master. Instead of relying
-on hash table iteration being stable, pass the GVariantBuilder down and
-add directly to it in the right order.
-
-Forwarded: https://gitlab.gnome.org/GNOME/tracker/merge_requests/55
----
- .../tracker-sparql-pattern.vala               |  4 +--
- src/libtracker-data/tracker-sparql-query.vala | 31 ++++++++++++-------
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
-index e03ed6f16..033b138a5 100644
---- a/src/libtracker-data/tracker-sparql-pattern.vala
-+++ b/src/libtracker-data/tracker-sparql-pattern.vala
-@@ -542,7 +542,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = query.generate_bnodeid (get_last_string ().substring (1));
-+			result = query.generate_bnodeid (get_last_string ().substring (1), null);
- 		} else if (current () == SparqlTokenType.STRING_LITERAL1) {
- 			result = expression.parse_string_literal ();
- 		} else if (current () == SparqlTokenType.STRING_LITERAL2) {
-@@ -569,7 +569,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (current () == SparqlTokenType.OPEN_BRACKET) {
- 			next ();
- 
--			result = query.generate_bnodeid (null);
-+			result = query.generate_bnodeid (null, null);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
-index 7944e78e5..69a7e9eba 100644
---- a/src/libtracker-data/tracker-sparql-query.vala
-+++ b/src/libtracker-data/tracker-sparql-query.vala
-@@ -284,7 +284,7 @@ public class Tracker.Sparql.Query : Object {
- 			sha1, sha1.substring (8), sha1.substring (12), sha1.substring (16), sha1.substring (20));
- 	}
- 
--	internal string generate_bnodeid (string? user_bnodeid) {
-+	internal string generate_bnodeid (string? user_bnodeid, GLib.VariantBuilder? builder) {
- 		// user_bnodeid is NULL for anonymous nodes
- 		if (user_bnodeid == null) {
- 			return ":%d".printf (++bnodeid);
-@@ -310,6 +310,9 @@ public class Tracker.Sparql.Query : Object {
- 				}
- 
- 				blank_nodes.insert (user_bnodeid, uri);
-+
-+				if (builder != null)
-+					builder.add ("{ss}", user_bnodeid, uri);
- 			}
- 
- 			return uri;
-@@ -774,7 +777,7 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				solution.solution_index = i;
- 				set_location (delete_location);
--				parse_construct_triples_block (solution, UpdateType.DELETE);
-+				parse_construct_triples_block (solution, UpdateType.DELETE, null);
- 				data_update.update_buffer_might_flush ();
- 			}
- 
-@@ -790,16 +793,20 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				uuid_generate (base_uuid);
- 				blank_nodes = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free);
-+				if (update_blank_nodes != null)
-+					update_blank_nodes.open (new GLib.VariantType("a{ss}"));
-+
- 				solution.solution_index = i;
- 
- 				set_location (insert_location);
- 				parse_construct_triples_block (solution,
- 							       insert_is_update ?
- 							       UpdateType.UPDATE :
--							       UpdateType.INSERT);
-+							       UpdateType.INSERT,
-+							       update_blank_nodes);
- 
- 				if (blank && update_blank_nodes != null) {
--					update_blank_nodes.add_value (blank_nodes);
-+					update_blank_nodes.close ();
- 				}
- 
- 				data_update.update_buffer_might_flush ();
-@@ -870,7 +877,7 @@ public class Tracker.Sparql.Query : Object {
- 		}
- 	}
- 
--	private void parse_construct_triples_block (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
-+	private void parse_construct_triples_block (Solution var_value_map, UpdateType type, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		expect (SparqlTokenType.OPEN_BRACE);
- 
- 		while (current () != SparqlTokenType.CLOSE_BRACE) {
-@@ -878,7 +885,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 			if (accept (SparqlTokenType.GRAPH)) {
- 				var old_graph = current_graph;
--				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for graph");
-@@ -887,7 +894,7 @@ public class Tracker.Sparql.Query : Object {
- 				expect (SparqlTokenType.OPEN_BRACE);
- 
- 				while (current () != SparqlTokenType.CLOSE_BRACE) {
--					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 					if (is_null) {
- 						throw get_error ("'null' not supported for subject");
-@@ -906,7 +913,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 				optional (SparqlTokenType.DOT);
- 			} else {
--				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for subject");
-@@ -925,7 +932,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	bool anon_blank_node_open = false;
- 
--	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null) throws Sparql.Error, DateError {
-+	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		string result = "";
- 		is_null = false;
- 		if (current () == SparqlTokenType.VAR) {
-@@ -947,7 +954,7 @@ public class Tracker.Sparql.Query : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = generate_bnodeid (get_last_string ().substring (1));
-+			result = generate_bnodeid (get_last_string ().substring (1), builder);
- 		} else if (current () == SparqlTokenType.MINUS) {
- 			next ();
- 			if (current () == SparqlTokenType.INTEGER ||
-@@ -994,7 +1001,7 @@ public class Tracker.Sparql.Query : Object {
- 			anon_blank_node_open = true;
- 			next ();
- 
--			result = generate_bnodeid (null);
-+			result = generate_bnodeid (null, builder);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-@@ -1061,7 +1068,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	private void parse_construct_object (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
- 		bool is_null = false;
--		string object = parse_construct_var_or_term (var_value_map, type, out is_null);
-+		string object = parse_construct_var_or_term (var_value_map, type, out is_null, null);
- 		var data = manager.get_data ();
- 		if (current_subject == null || current_predicate == null || object == null) {
- 			// the SPARQL specification says that triples containing unbound variables
--- 
-2.17.0
-

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
deleted file mode 100644
index a1fa32738d8..00000000000
--- a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@×××××.org>
-Date: Mon, 17 Dec 2018 13:34:23 +0100
-Subject: [PATCH] libtracker-data: Update FTS if base tables were altered
-
-That will issue an update of all tables, so the FTS view might be
-affected. This is not caught by ontology change tests, as this
-is a situation that can only happen when migrating from 1.x databases
-ATM.
-
-(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144)
----
- src/libtracker-data/tracker-data-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
-index f2addd0df..05a96b4dd 100644
---- a/src/libtracker-data/tracker-data-manager.c
-+++ b/src/libtracker-data/tracker-data-manager.c
-@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager  *manager,
- 	}
- 
- #if HAVE_TRACKER_FTS
--	if (in_update) {
--		update_fts = tracker_data_manager_fts_changed (manager);
-+	if (base_tables_altered || in_update) {
-+		update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager);
- 
- 		if (update_fts)
- 			tracker_db_interface_sqlite_fts_delete_table (iface);
--- 
-2.17.0
-

diff --git a/app-misc/tracker/files/2.1.7-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-doc-options.patch
rename to app-misc/tracker/files/2.1.8-doc-options.patch

diff --git a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-fix-library-symlinks.patch
rename to app-misc/tracker/files/2.1.8-fix-library-symlinks.patch

diff --git a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch
rename to app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch

diff --git a/app-misc/tracker/files/2.1.7-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch
similarity index 100%
rename from app-misc/tracker/files/2.1.7-test-fix.patch
rename to app-misc/tracker/files/2.1.8-test-fix.patch

diff --git a/app-misc/tracker/tracker-2.1.7-r1.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
similarity index 96%
rename from app-misc/tracker/tracker-2.1.7-r1.ebuild
rename to app-misc/tracker/tracker-2.1.8.ebuild
index 3d59f4f66b6..643340f1f2c 100644
--- a/app-misc/tracker/tracker-2.1.7-r1.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -48,9 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
-	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
-	"${FILESDIR}"/${PV}-upgrade-path-fix.patch
 )
 
 function inotify_enabled() {