gentoo resync : 03.03.2019

8 files changed, 6 insertions, 212 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 2751eb64e225..cd7706cdb37c 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,11 +1,9 @@
-AUX 2.1.7-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c
-AUX 2.1.7-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
-AUX 2.1.7-glib-2.60-compat.patch 7341 BLAKE2B 64a322db244551b15c037aaca8f868ced632c25600e1e7c83a22eb532535e9d4eb317e0f9aa0df8b52c86077af839dcfba2f4846e91a37e42d325b7681379b98 SHA512 d14c760626541e3ac0cce55bd837a5ca4a0e627d43aea491d1f1cbbca0ab445317519506a2ae2a22416b39ce9708926683ac9dd3be244d9ae2eb53e5b2675f8d
-AUX 2.1.7-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
-AUX 2.1.7-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
-AUX 2.1.7-upgrade-path-fix.patch 1251 BLAKE2B ea343e15348ddfe8a8a36fc9060d14dc5e8ec2a777e473ab39041692d67c4a5c0ebd8793f6896b49e2c353c25167b5dc42e167222f566757fdd9504d2906928b SHA512 965055c9526fa523d11b77c6bb3bddaa1323dd06d5cccb2f638f89402380b746e11e60f828ecfb4b35e20715a97f940980edbb6a6d2416356c4a84da0ac476c4
+AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c
+AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
+AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
+AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
 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
 EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131
-EBUILD tracker-2.1.7-r1.ebuild 2908 BLAKE2B 52804fce82218814125b5903b3f7546d1c443c0463cd6db1be9077e5be8e2bcd5d9dc2ab823709eed3530139f6b7fdcb47d8a4db9b8c7733d29e637fc824d1fb SHA512 f27d33944fecdcfc73fd62090ccd9474bb992a3d91eafc5817eef094344b2a3034252d57755bec9053ad183bd74af3fe6fddd668b26709c48859a99640432752
+EBUILD tracker-2.1.8.ebuild 2820 BLAKE2B 57729529f599964d142f2da8a5f9568a23bc15ace8d93859b1a65e505fb94e97806e5f5fed70316952214ac13bba83a31f31dc2cad0739d52176ea78a397d42b SHA512 9386ce363bde67ccd20ccf15403fc450a4baf7a7374b9b5f3896c356dd23686df6291a9d35e07ffc127da065b2bfc1c8f168ba6dd8fcb50e114cec1bc9ec0f55
 MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71
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 93737f79857d..000000000000
--- 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@gnome.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 a1fa32738d88..000000000000
--- 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@gnome.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
index 9b25349f659f..9b25349f659f 100644
--- a/app-misc/tracker/files/2.1.7-doc-options.patch
+++ b/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
index 85ddb6baa22b..85ddb6baa22b 100644
--- a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch
+++ b/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
index 1f25f115d419..1f25f115d419 100644
--- a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch
+++ b/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
index b3dedaa9e6ec..b3dedaa9e6ec 100644
--- a/app-misc/tracker/files/2.1.7-test-fix.patch
+++ b/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
index 3d59f4f66b6c..643340f1f2c1 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() {