[tracker] Build fixes. JB#48719

Backport Vala 0.43 build fix, abstract create_statement vala fix, and use IOSchedulerJob instead of removed g_io_scheduler_push_job Restore tracker-remote because we have the required packages now.
sailfishos · Jan 30, 2020 · 3275801 · 3275801
1 parent cb597b8
commit 3275801
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 134 deletions.
diff --git a/rpm/012-disable-tracker-remote.patch b/rpm/012-disable-tracker-remote.patch
diff --git a/rpm/017-libtracker-data-Fix-build-with-Vala-0.43.patch b/rpm/017-libtracker-data-Fix-build-with-Vala-0.43.patch
@@ -0,0 +1,140 @@
+From 2a3a3fefe53571690a86aa0df8fad70e0243a003 Thu, 30 Jan 2020 10:31:41 +0100
+From: Jürg Billeter <j@bitron.ch>
+Date: Wed, 6 Feb 2019 17:28:01 +0100
+Subject: [PATCH] libtracker-data: Fix build with Vala 0.43
+
+
+https://gitlab.gnome.org/GNOME/tracker/issues/75
+
+Also include 2eedcef7ef3aa647b8d50da4606b3247aa0855c7
+libtracker-data: DBInterface.create_statement() may not be abstract in vala
+
+https://bugzilla.gnome.org/show_bug.cgi?id=796104
+
+Also 8aa8759c40259ebc5daf6dca577877e55e030a2a Thu, 30 Jan 2020 11:11:23 +0100
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 30 May 2018 14:12:46 +0200
+Subject: [PATCH] libtracker-sparql: Use replacement for IOSchedulerJob.push() which is still deprecated
+
+And a similar piece of 85b8ff8859d7e7815a72568e86ed78376db2847e
+
+diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
+index 59810da..e03ed6f 100644
+--- a/src/libtracker-data/tracker-sparql-pattern.vala
++++ b/src/libtracker-data/tracker-sparql-pattern.vala
+@@ -230,10 +230,10 @@
+ 			base (query, parent_context);
+
+ 			tables = new List<DataTable> ();
+-			table_map = new HashTable<string,DataTable>.full (str_hash, str_equal, g_free, g_object_unref);
++			table_map = new HashTable<string,DataTable>.full (str_hash, str_equal, g_free, GLib.Object.unref);
+
+ 			variables = new List<Variable> ();
+-			var_bindings = new HashTable<Variable,VariableBindingList>.full (Variable.hash, Variable.equal, g_object_unref, g_object_unref);
++			var_bindings = new HashTable<Variable,VariableBindingList>.full (Variable.hash, Variable.equal, GLib.Object.unref, GLib.Object.unref);
+
+ 			bindings = new List<LiteralBinding> ();
+ 		}
+@@ -935,7 +935,7 @@
+
+ 			// only export selected variables
+ 			context.var_set = context.select_var_set;
+-			context.select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
++			context.select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
+
+ 			expect (SparqlTokenType.CLOSE_BRACE);
+
+@@ -1216,7 +1216,7 @@
+
+ 	void translate_group_or_union_graph_pattern (StringBuilder sql) throws Sparql.Error {
+ 		Variable[] all_vars = { };
+-		HashTable<Variable,int> all_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
++		HashTable<Variable,int> all_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
+
+ 		Context[] contexts = { };
+ 		long[] offsets = { };
+diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
+index 54ce570..7944e78 100644
+--- a/src/libtracker-data/tracker-sparql-query.vala
++++ b/src/libtracker-data/tracker-sparql-query.vala
+@@ -125,12 +125,12 @@
+ 		public Context (Query query, Context? parent_context = null) {
+ 			this.query = query;
+ 			this.parent_context = parent_context;
+-			this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
++			this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
+
+ 			if (parent_context == null) {
+-				select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
+-				var_map = new HashTable<string,Variable>.full (str_hash, str_equal, g_free, g_object_unref);
+-				predicate_variable_map = new HashTable<Variable,PredicateVariable>.full (Variable.hash, Variable.equal, g_object_unref, g_object_unref);
++				select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
++				var_map = new HashTable<string,Variable>.full (str_hash, str_equal, g_free, GLib.Object.unref);
++				predicate_variable_map = new HashTable<Variable,PredicateVariable>.full (Variable.hash, Variable.equal, GLib.Object.unref, GLib.Object.unref);
+ 			} else {
+ 				select_var_set = parent_context.select_var_set;
+ 				var_map = parent_context.var_map;
+@@ -141,11 +141,11 @@
+ 		public Context.subquery (Query query, Context parent_context) {
+ 			this.query = query;
+ 			this.parent_context = parent_context;
+-			this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
++			this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
+
+-			select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, g_object_unref, null);
++			select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, GLib.Object.unref, null);
+ 			var_map = parent_context.var_map;
+-			predicate_variable_map = new HashTable<Variable,PredicateVariable>.full (Variable.hash, Variable.equal, g_object_unref, g_object_unref);
++			predicate_variable_map = new HashTable<Variable,PredicateVariable>.full (Variable.hash, Variable.equal, GLib.Object.unref, GLib.Object.unref);
+ 			scalar_subquery = true;
+ 		}
+
+diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
+index ba09968..a9e446c 100644
+--- a/src/libtracker-data/libtracker-data.vapi
++++ b/src/libtracker-data/libtracker-data.vapi
+@@ -63,7 +63,7 @@
+ 	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
+ 	public interface DBInterface : GLib.Object {
+ 		[PrintfFormat]
+-		public abstract DBStatement create_statement (DBStatementCacheType cache_type, ...) throws DBInterfaceError;
++		public DBStatement create_statement (DBStatementCacheType cache_type, ...) throws DBInterfaceError;
+ 		[PrintfFormat]
+ 		public void execute_query (...) throws DBInterfaceError;
+ 		[CCode (cheader_filename = "libtracker-data/tracker-db-interface-sqlite.h")]
+diff --git a/src/libtracker-direct/tracker-direct.vala b/src/libtracker-direct/tracker-direct.vala
+index da9feaa..aac1fe5 100644
+--- a/src/libtracker-direct/tracker-direct.vala
++++ b/src/libtracker-direct/tracker-direct.vala
+@@ -97,7 +97,7 @@
+ 		Sparql.Cursor result = null;
+ 		var context = MainContext.get_thread_default ();
+
+-		g_io_scheduler_push_job (job => {
++		IOSchedulerJob.push ((job, cancellable) => {
+ 			try {
+ 				result = query (sparql, cancellable);
+ 			} catch (IOError e_io) {
+diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql-backend/tracker-backend.vala
+index 23cc27c..4908840 100644
+--- a/src/libtracker-sparql-backend/tracker-backend.vala
++++ b/src/libtracker-sparql-backend/tracker-backend.vala
+@@ -302,7 +302,7 @@
+ 		Connection result = null;
+ 		var context = MainContext.get_thread_default ();
+
+-		g_io_scheduler_push_job (job => {
++		IOSchedulerJob.push (job => {
+ 			try {
+ 				result = get (cancellable);
+ 			} catch (IOError e_io) {
+@@ -323,7 +323,7 @@
+ 			source.attach (context);
+
+ 			return false;
+-		});
++		}, GLib.Priority.DEFAULT);
+ 		yield;
+
+ 		if (sparql_error != null) {
+
diff --git a/rpm/tracker-libav.spec b/rpm/tracker-libav.spec
@@ -5,7 +5,6 @@ Name:       tracker
 Summary:    An object database, tag/metadata database, search tool and indexer
 Version:    1.12.4
 Release:    1
-Group:      Data Management/Content Framework
 License:    GPLv2+ and LGPLv2.1+ and BSD
 URL:        http://ftp.gnome.org/pub/GNOME/sources/tracker/1.12/
 Source0:    http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.12/%{name}-%{version}.tar.xz
@@ -23,11 +22,11 @@ Patch8:     008-tracker-Fix-flac-tag-extraction-Fixes-JB35939.patch
 Patch9:     009-tracker-Add-album-art-extraction-for-libav-and-flac-.patch
 Patch10:    010-tracker-Use-Xing-mp3-header-when-available-Fixes-JB3.patch
 Patch11:    011-revert-libmediaart-disable.patch
-Patch12:    012-disable-tracker-remote.patch
 Patch13:    013-miner-Fix-mining-of-files-whose-data-was-inserted-by.patch
 Patch14:    014-fix-systemd-unit-files.patch
 Patch15:    015-allow-skip-reset-prompt.patch
 Patch16:    016-Disable-libtracker-sparql-parallel-build.patch
+Patch17:    017-libtracker-data-Fix-build-with-Vala-0.43.patch
 
 Requires:   libmediaart
 Requires:   unzip
@@ -65,6 +64,8 @@ BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  gettext
 BuildRequires:  libtool
 BuildRequires:  vala-devel >= 0.16
@@ -146,11 +147,11 @@ Man pages for %{name}.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 sed -i -e '/gtkdocize/d' autogen.sh