snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

tracker: update to 3.7.1.

This commit is contained in:
oreo639 2024-03-27 21:53:54 -07:00
parent b38762a6ad
commit 52a079b94c
2 changed files with 2 additions and 664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

662
srcpkgs/tracker/patches/fix-stalls.patch
View File

@ -1,662 +0,0 @@
From 862f0854dd2a7f9694b8d5f65e0570638da20f7c Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 23 Mar 2024 21:40:15 +0100
Subject: [PATCH 1/2] direct: Plug leak
The input stream obtained from a DBus request is leaked after use.
---
src/libtracker-sparql/direct/tracker-direct-batch.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libtracker-sparql/direct/tracker-direct-batch.c b/src/libtracker-sparql/direct/tracker-direct-batch.c
index 2bcb8fb912..433bd98487 100644
--- a/src/libtracker-sparql/direct/tracker-direct-batch.c
+++ b/src/libtracker-sparql/direct/tracker-direct-batch.c
@@ -282,6 +282,8 @@ tracker_batch_elem_clear (TrackerBatchElem *elem)
} else if (elem->type == TRACKER_DIRECT_BATCH_RDF) {
g_free (elem->d.rdf.default_graph);
g_clear_object (&elem->d.rdf.stream);
+ } else if (elem->type == TRACKER_DIRECT_BATCH_DBUS_FD) {
+ g_clear_object (&elem->d.dbus_fd);
}
}
--
GitLab
From 3a4fae94d112a1b39980e539cb64d78bf7d5dfd8 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 23 Mar 2024 21:39:21 +0100
Subject: [PATCH 2/2] bus: Write SPARQL queries asynchronously
Write SPARQL queries asynchronously, in all of our update(_async)
and batch operations. This means we wait for both the DBus message
and the FD write responses to consider the operation finished,
like we already do for deserialization.
Closes: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328
---
src/libtracker-sparql/bus/tracker-bus-batch.c | 3 +-
.../bus/tracker-bus-statement.c | 11 +-
src/libtracker-sparql/bus/tracker-bus.c | 305 +++++++++++++-----
src/libtracker-sparql/bus/tracker-bus.h | 3 +-
4 files changed, 236 insertions(+), 86 deletions(-)
diff --git a/src/libtracker-sparql/bus/tracker-bus-batch.c b/src/libtracker-sparql/bus/tracker-bus-batch.c
index 69b6f932fc..d0d4ab0e13 100644
--- a/src/libtracker-sparql/bus/tracker-bus-batch.c
+++ b/src/libtracker-sparql/bus/tracker-bus-batch.c
@@ -335,8 +335,7 @@ tracker_bus_batch_execute_async (TrackerBatch *batch,
task = g_task_new (batch, cancellable, callback, user_data);
conn = tracker_batch_get_connection (batch);
tracker_bus_connection_perform_update_async (TRACKER_BUS_CONNECTION (conn),
- (TrackerBusOp *) bus_batch->ops->data,
- bus_batch->ops->len,
+ bus_batch->ops,
cancellable,
update_array_cb,
task);
diff --git a/src/libtracker-sparql/bus/tracker-bus-statement.c b/src/libtracker-sparql/bus/tracker-bus-statement.c
index 0411ad1af9..72b2ba0330 100644
--- a/src/libtracker-sparql/bus/tracker-bus-statement.c
+++ b/src/libtracker-sparql/bus/tracker-bus-statement.c
@@ -302,6 +302,7 @@ tracker_bus_statement_update (TrackerSparqlStatement *stmt,
GMainContext *context;
UpdateAsyncData data = { 0, };
TrackerBusOp op = { 0, };
+ GArray *ops;
const gchar *sparql;
conn = tracker_sparql_statement_get_connection (stmt);
@@ -311,12 +312,14 @@ tracker_bus_statement_update (TrackerSparqlStatement *stmt,
data.loop = g_main_loop_new (context, FALSE);
g_main_context_push_thread_default (context);
+ ops = g_array_new (FALSE, FALSE, sizeof (TrackerBusOp));
op.type = TRACKER_BUS_OP_SPARQL;
op.d.sparql.sparql = (gchar *) sparql;
op.d.sparql.parameters = bus_stmt->arguments;
+ g_array_append_val (ops, op);
tracker_bus_connection_perform_update_async (TRACKER_BUS_CONNECTION (conn),
- &op, 1,
+ ops,
cancellable,
update_cb,
&data);
@@ -363,6 +366,7 @@ tracker_bus_statement_update_async (TrackerSparqlStatement *stmt,
{
TrackerBusStatement *bus_stmt = TRACKER_BUS_STATEMENT (stmt);
TrackerSparqlConnection *conn;
+ GArray *ops;
TrackerBusOp op = { 0, };
const gchar *sparql;
GTask *task;
@@ -372,15 +376,18 @@ tracker_bus_statement_update_async (TrackerSparqlStatement *stmt,
task = g_task_new (stmt, cancellable, callback, user_data);
+ ops = g_array_new (FALSE, FALSE, sizeof (TrackerBusOp));
op.type = TRACKER_BUS_OP_SPARQL;
op.d.sparql.sparql = (gchar *) sparql;
op.d.sparql.parameters = bus_stmt->arguments;
+ g_array_append_val (ops, op);
tracker_bus_connection_perform_update_async (TRACKER_BUS_CONNECTION (conn),
- &op, 1,
+ ops,
cancellable,
update_async_cb,
task);
+ g_array_unref (ops);
}
static gboolean
diff --git a/src/libtracker-sparql/bus/tracker-bus.c b/src/libtracker-sparql/bus/tracker-bus.c
index 1547c5f08b..52eeed2e52 100644
--- a/src/libtracker-sparql/bus/tracker-bus.c
+++ b/src/libtracker-sparql/bus/tracker-bus.c
@@ -75,6 +75,14 @@ typedef struct {
} dbus, splice;
} DeserializeTaskData;
+typedef struct {
+ struct {
+ GError *error;
+ gboolean finished;
+ } dbus, write;
+ GVariant *retval;
+} UpdateTaskData;
+
static void tracker_bus_connection_async_initable_iface_init (GAsyncInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (TrackerBusConnection, tracker_bus_connection,
@@ -218,31 +226,62 @@ create_deserialize_message (TrackerBusConnection *conn,
return message;
}
-static gboolean
-write_sparql_query (GOutputStream *ostream,
- const gchar *query,
- GError **error)
+static void
+write_sparql_query_in_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
{
+ GOutputStream *ostream = source_object;
GDataOutputStream *data;
+ const gchar *query;
+ GError *error = NULL;
int len;
+ query = g_task_get_task_data (task);
len = strlen (query);
data = g_data_output_stream_new (ostream);
g_data_output_stream_set_byte_order (data, G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN);
- if (!g_data_output_stream_put_uint32 (data, TRACKER_BUS_OP_SPARQL, NULL, error))
+
+ if (!g_data_output_stream_put_uint32 (data, TRACKER_BUS_OP_SPARQL, cancellable, &error))
goto error;
- if (!g_data_output_stream_put_int32 (data, len, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, len, cancellable, &error))
goto error;
- if (!g_data_output_stream_put_string (data, query, NULL, error))
+ if (!g_data_output_stream_put_string (data, query, cancellable, &error))
goto error;
- if (!g_data_output_stream_put_int32 (data, 0, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, 0, cancellable, &error))
goto error;
- g_object_unref (data);
- return TRUE;
error:
+ if (error)
+ g_task_return_error (task, error);
+ else
+ g_task_return_boolean (task, TRUE);
+
g_object_unref (data);
- return FALSE;
+}
+
+static void
+write_sparql_query_async (GOutputStream *ostream,
+ const gchar *query,
+ GCancellable *cancellable,
+ GAsyncReadyCallback cb,
+ gpointer user_data)
+{
+ GTask *task;
+
+ task = g_task_new (ostream, cancellable, cb, user_data);
+ g_task_set_task_data (task, (gpointer) query, NULL);
+ g_task_run_in_thread (task, write_sparql_query_in_thread);
+ g_object_unref (task);
+}
+
+static gboolean
+write_sparql_query_finish (GOutputStream *stream,
+ GAsyncResult *res,
+ GError **error)
+{
+ return g_task_propagate_boolean (G_TASK (res), error);
}
static GVariant *
@@ -266,37 +305,41 @@ convert_params (GHashTable *parameters)
return g_variant_ref_sink (g_variant_builder_end (&builder));
}
-static gboolean
-write_sparql_queries (GOutputStream *ostream,
- TrackerBusOp *ops,
- gint n_ops,
- GError **error)
+static void
+write_sparql_queries_in_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
{
+ GOutputStream *ostream = source_object;
+ GArray *op_array;
GDataOutputStream *data;
GOutputStream *rdf_stream = NULL;
GBytes *bytes = NULL;
gchar *params_str = NULL;
- int i;
+ GError *error = NULL;
+ guint i;
+ op_array = g_task_get_task_data (task);
data = g_data_output_stream_new (ostream);
g_data_output_stream_set_byte_order (data, G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN);
- if (!g_data_output_stream_put_int32 (data, n_ops, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, op_array->len, cancellable, &error))
goto error;
- for (i = 0; i < n_ops; i++) {
- TrackerBusOp *op = &ops[i];
+ for (i = 0; i < op_array->len; i++) {
+ TrackerBusOp *op = &g_array_index (op_array, TrackerBusOp, i);
- if (!g_data_output_stream_put_int32 (data, op->type, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, op->type, cancellable, &error))
goto error;
if (op->type == TRACKER_BUS_OP_SPARQL) {
if (!g_data_output_stream_put_int32 (data,
strlen (op->d.sparql.sparql),
- NULL, error))
+ cancellable, &error))
goto error;
if (!g_data_output_stream_put_string (data, op->d.sparql.sparql,
- NULL, error))
+ cancellable, &error))
goto error;
if (op->d.sparql.parameters) {
@@ -308,33 +351,33 @@ write_sparql_queries (GOutputStream *ostream,
if (!g_data_output_stream_put_int32 (data,
strlen (params_str),
- NULL, error))
+ cancellable, &error))
goto error;
if (!g_data_output_stream_put_string (data, params_str,
- NULL, error))
+ cancellable, &error))
goto error;
g_clear_pointer (&params_str, g_free);
} else {
- if (!g_data_output_stream_put_int32 (data, 0, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, 0, cancellable, &error))
goto error;
}
} else if (op->type == TRACKER_BUS_OP_RDF) {
- if (!g_data_output_stream_put_uint32 (data, op->d.rdf.flags, NULL, error))
+ if (!g_data_output_stream_put_uint32 (data, op->d.rdf.flags, cancellable, &error))
goto error;
- if (!g_data_output_stream_put_uint32 (data, op->d.rdf.format, NULL, error))
+ if (!g_data_output_stream_put_uint32 (data, op->d.rdf.format, cancellable, &error))
goto error;
if (op->d.rdf.default_graph) {
if (!g_data_output_stream_put_int32 (data,
strlen (op->d.rdf.default_graph),
- NULL, error))
+ cancellable, &error))
goto error;
if (!g_data_output_stream_put_string (data, op->d.rdf.default_graph,
- NULL, error))
+ cancellable, &error))
goto error;
} else {
- if (!g_data_output_stream_put_int32 (data, 0, NULL, error))
+ if (!g_data_output_stream_put_int32 (data, 0, cancellable, &error))
goto error;
}
@@ -343,36 +386,60 @@ write_sparql_queries (GOutputStream *ostream,
op->d.rdf.stream,
G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE |
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
- NULL,
- error) < 0)
+ cancellable,
+ &error) < 0)
goto error;
bytes = g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (rdf_stream));
g_clear_object (&rdf_stream);
- if (!g_data_output_stream_put_uint32 (data, g_bytes_get_size (bytes), NULL, error))
+ if (!g_data_output_stream_put_uint32 (data, g_bytes_get_size (bytes), cancellable, &error))
goto error;
if (!g_output_stream_write_all (G_OUTPUT_STREAM (data),
g_bytes_get_data (bytes, NULL),
g_bytes_get_size (bytes),
NULL,
- NULL,
- error))
+ cancellable,
+ &error))
goto error;
g_clear_pointer (&bytes, g_bytes_unref);
}
}
- g_output_stream_close (G_OUTPUT_STREAM (data), NULL, NULL);
- g_object_unref (data);
- return TRUE;
error:
g_clear_object (&rdf_stream);
g_clear_pointer (&bytes, g_bytes_unref);
g_clear_pointer (&params_str, g_free);
g_object_unref (data);
- return FALSE;
+
+ if (error)
+ g_task_return_error (task, error);
+ else
+ g_task_return_boolean (task, TRUE);
+}
+
+static void
+write_sparql_queries_async (GOutputStream *ostream,
+ GArray *ops,
+ GCancellable *cancellable,
+ GAsyncReadyCallback cb,
+ gpointer user_data)
+{
+ GTask *task;
+
+ task = g_task_new (ostream, cancellable, cb, user_data);
+ g_task_set_task_data (task, g_array_ref (ops), (GDestroyNotify) g_array_unref);
+ g_task_run_in_thread (task, write_sparql_queries_in_thread);
+ g_object_unref (task);
+}
+
+static gboolean
+write_sparql_queries_finish (GOutputStream *stream,
+ GAsyncResult *res,
+ GError **error)
+{
+ return g_task_propagate_boolean (G_TASK (res), error);
}
static void
@@ -905,23 +972,68 @@ tracker_bus_connection_update (TrackerSparqlConnection *self,
g_propagate_error (error, data.error);
}
+static void
+check_finish_update (GTask *task)
+{
+ UpdateTaskData *data;
+
+ data = g_task_get_task_data (task);
+
+ if (!data->dbus.finished || !data->write.finished)
+ return;
+
+ if (data->dbus.error) {
+ g_dbus_error_strip_remote_error (data->dbus.error);
+ g_task_return_error (task, g_steal_pointer (&data->dbus.error));
+ } else if (data->write.error) {
+ g_task_return_error (task, g_steal_pointer (&data->write.error));
+ } else {
+ g_task_return_pointer (task, g_steal_pointer (&data->retval),
+ (GDestroyNotify) g_variant_unref);
+ }
+
+ g_object_unref (task);
+}
+
static void
update_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
GTask *task = user_data;
- GError *error = NULL;
- GVariant *retval;
+ UpdateTaskData *data;
- retval = perform_update_finish (TRACKER_BUS_CONNECTION (object),
- res, &error);
- if (error)
- g_task_return_error (task, error);
- else
- g_task_return_pointer (task, retval, (GDestroyNotify) g_variant_unref);
+ data = g_task_get_task_data (task);
+ data->retval = perform_update_finish (TRACKER_BUS_CONNECTION (object),
+ res, &data->dbus.error);
+ data->dbus.finished = TRUE;
+ check_finish_update (task);
+}
- g_object_unref (task);
+static void
+write_query_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GTask *task = user_data;
+ UpdateTaskData *data;
+
+ data = g_task_get_task_data (task);
+ write_sparql_query_finish (G_OUTPUT_STREAM (object),
+ res, &data->write.error);
+ data->write.finished = TRUE;
+ check_finish_update (task);
+}
+
+static void
+update_task_data_free (gpointer data)
+{
+ UpdateTaskData *task_data = data;
+
+ g_clear_error (&task_data->dbus.error);
+ g_clear_error (&task_data->write.error);
+ g_clear_pointer (&task_data->retval, g_variant_unref);
+ g_free (task_data);
}
static void
@@ -931,6 +1043,7 @@ tracker_bus_connection_update_async (TrackerSparqlConnection *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ UpdateTaskData *data;
GUnixFDList *fd_list;
GOutputStream *ostream;
GError *error = NULL;
@@ -939,6 +1052,9 @@ tracker_bus_connection_update_async (TrackerSparqlConnection *self,
task = g_task_new (self, cancellable, callback, user_data);
+ data = g_new0 (UpdateTaskData, 1);
+ g_task_set_task_data (task, data, update_task_data_free);
+
if (!create_pipe_for_write (&ostream, &fd_list, &fd_idx, &error)) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -946,14 +1062,15 @@ tracker_bus_connection_update_async (TrackerSparqlConnection *self,
}
perform_update_async (TRACKER_BUS_CONNECTION (self),
- "Update",
- fd_list, fd_idx,
- cancellable,
- update_cb,
- task);
-
- write_sparql_query (ostream, sparql, NULL);
- g_output_stream_close (ostream, NULL, NULL);
+ "Update",
+ fd_list, fd_idx,
+ cancellable,
+ update_cb,
+ task);
+
+ write_sparql_query_async (ostream, sparql,
+ cancellable,
+ write_query_cb, task);
g_object_unref (ostream);
g_object_unref (fd_list);
}
@@ -977,23 +1094,25 @@ tracker_bus_connection_update_array_async (TrackerSparqlConnection *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- TrackerBusOp *ops;
+ GArray *ops;
gint i;
- ops = g_new0 (TrackerBusOp, n_updates);
+ ops = g_array_sized_new (FALSE, FALSE, sizeof (TrackerBusOp), n_updates);
for (i = 0; i < n_updates; i++) {
- ops[i].type = TRACKER_BUS_OP_SPARQL;
- ops[i].d.sparql.sparql = updates[i];
+ TrackerBusOp op = { 0, };
+
+ op.type = TRACKER_BUS_OP_SPARQL;
+ op.d.sparql.sparql = updates[i];
+ g_array_append_val (ops, op);
}
tracker_bus_connection_perform_update_async (TRACKER_BUS_CONNECTION (self),
ops,
- n_updates,
cancellable,
callback,
user_data);
- g_free (ops);
+ g_array_unref (ops);
}
static gboolean
@@ -1063,6 +1182,7 @@ tracker_bus_connection_update_blank_async (TrackerSparqlConnection *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ UpdateTaskData *data;
GUnixFDList *fd_list;
GOutputStream *ostream;
GError *error = NULL;
@@ -1071,6 +1191,9 @@ tracker_bus_connection_update_blank_async (TrackerSparqlConnection *self,
task = g_task_new (self, cancellable, callback, user_data);
+ data = g_new0 (UpdateTaskData, 1);
+ g_task_set_task_data (task, data, update_task_data_free);
+
if (!create_pipe_for_write (&ostream, &fd_list, &fd_idx, &error)) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -1078,14 +1201,16 @@ tracker_bus_connection_update_blank_async (TrackerSparqlConnection *self,
}
perform_update_async (TRACKER_BUS_CONNECTION (self),
- "UpdateBlank",
- fd_list, fd_idx,
- cancellable,
- update_cb,
- task);
-
- write_sparql_query (ostream, sparql, NULL);
- g_output_stream_close (ostream, NULL, NULL);
+ "UpdateBlank",
+ fd_list, fd_idx,
+ cancellable,
+ update_cb,
+ task);
+
+ write_sparql_query_async (ostream, sparql,
+ cancellable, write_query_cb,
+ task);
+
g_object_unref (ostream);
g_object_unref (fd_list);
}
@@ -1326,9 +1451,9 @@ check_finish_deserialize (GTask *task)
if (data->dbus.error) {
g_dbus_error_strip_remote_error (data->dbus.error);
- g_task_return_error (task, data->dbus.error);
+ g_task_return_error (task, g_steal_pointer (&data->dbus.error));
} else if (data->splice.error) {
- g_task_return_error (task, data->splice.error);
+ g_task_return_error (task, g_steal_pointer (&data->splice.error));
} else {
g_task_return_boolean (task, TRUE);
}
@@ -1800,14 +1925,29 @@ tracker_bus_connection_perform_serialize_finish (TrackerBusConnection *conn,
return g_task_propagate_pointer (G_TASK (res), error);
}
+static void
+write_queries_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GTask *task = user_data;
+ UpdateTaskData *data;
+
+ data = g_task_get_task_data (task);
+ write_sparql_queries_finish (G_OUTPUT_STREAM (object),
+ res, &data->write.error);
+ data->write.finished = TRUE;
+ check_finish_update (task);
+}
+
void
tracker_bus_connection_perform_update_async (TrackerBusConnection *self,
- TrackerBusOp *ops,
- guint n_ops,
+ GArray *ops,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ UpdateTaskData *data;
GUnixFDList *fd_list;
GOutputStream *ostream;
GError *error = NULL;
@@ -1816,12 +1956,15 @@ tracker_bus_connection_perform_update_async (TrackerBusConnection *self,
task = g_task_new (self, cancellable, callback, user_data);
- if (n_ops == 0) {
+ if (ops->len == 0) {
g_task_return_pointer (task, NULL, NULL);
g_object_unref (task);
return;
}
+ data = g_new0 (UpdateTaskData, 1);
+ g_task_set_task_data (task, data, update_task_data_free);
+
if (!create_pipe_for_write (&ostream, &fd_list, &fd_idx, &error)) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -1835,8 +1978,10 @@ tracker_bus_connection_perform_update_async (TrackerBusConnection *self,
update_cb,
task);
- write_sparql_queries (ostream, ops, n_ops, NULL);
- g_output_stream_close (ostream, NULL, NULL);
+ write_sparql_queries_async (ostream, ops,
+ cancellable, write_queries_cb,
+ task);
+
g_object_unref (ostream);
g_object_unref (fd_list);
}
diff --git a/src/libtracker-sparql/bus/tracker-bus.h b/src/libtracker-sparql/bus/tracker-bus.h
index 6f6e084de4..75526b60d8 100644
--- a/src/libtracker-sparql/bus/tracker-bus.h
+++ b/src/libtracker-sparql/bus/tracker-bus.h
@@ -103,8 +103,7 @@ GInputStream * tracker_bus_connection_perform_serialize_finish (TrackerBusConnec
GError **error);
void tracker_bus_connection_perform_update_async (TrackerBusConnection *self,
- TrackerBusOp *ops,
- guint n_ops,
+ GArray *ops,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
--
GitLab

4
srcpkgs/tracker/template
View File

@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
version=3.7.0
version=3.7.1
revision=1
build_style=meson
build_helper="gir qemu"
@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
checksum=cd91b885ee9839cde5387f8e05ed24a7108d1627629cb6b1b2aa51a9603e130a
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then