* [PR PATCH] tracker: update to 3.7.0.
@ 2024-03-23 5:36 oreo639
2024-03-23 5:50 ` [PR PATCH] [Updated] " oreo639
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 25766 bytes --]
From c9573fdd1231a5c7106187db81c25529ce63d133 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ----------------------
srcpkgs/tracker/template | 6 +-
2 files changed, 3 insertions(+), 569 deletions(-)
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From ff9adc540f0ce36a7adb4ebe688ffa0d4f78b69f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
srcpkgs/tracker-miners/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..07970b4dd601f6 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
@ 2024-03-23 5:50 ` oreo639
2024-03-23 5:51 ` oreo639
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 5:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 26597 bytes --]
From c9573fdd1231a5c7106187db81c25529ce63d133 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ----------------------
srcpkgs/tracker/template | 6 +-
2 files changed, 3 insertions(+), 569 deletions(-)
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 44307855a2c3a9bc06913f7e06fec6320bc05fc6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
srcpkgs/tracker-miners/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..e7938e5615a456 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,10 +1,11 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
+
configure_args="-Dtracker_core=system -Dextract=true
-Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
@@ -12,7 +13,8 @@ configure_args="-Dtracker_core=system -Dextract=true
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
-Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
-Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled
+ -Dlandlock=disabled"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
@@ -27,7 +29,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
2024-03-23 5:50 ` [PR PATCH] [Updated] " oreo639
@ 2024-03-23 5:51 ` oreo639
2024-03-23 6:31 ` oreo639
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 5:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 26375 bytes --]
From c9573fdd1231a5c7106187db81c25529ce63d133 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ----------------------
srcpkgs/tracker/template | 6 +-
2 files changed, 3 insertions(+), 569 deletions(-)
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 531ceeef3dac92a4f3045c3cf58d8d59c951d0a5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
srcpkgs/tracker-miners/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..3ed349f7c4118d 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
@@ -12,7 +12,8 @@ configure_args="-Dtracker_core=system -Dextract=true
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
-Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
-Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled
+ -Dlandlock=disabled"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
@@ -27,7 +28,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
2024-03-23 5:50 ` [PR PATCH] [Updated] " oreo639
2024-03-23 5:51 ` oreo639
@ 2024-03-23 6:31 ` oreo639
2024-03-23 6:31 ` oreo639
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 6:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 27311 bytes --]
From c9573fdd1231a5c7106187db81c25529ce63d133 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ----------------------
srcpkgs/tracker/template | 6 +-
2 files changed, 3 insertions(+), 569 deletions(-)
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 619123a9708fcc55be61d50fb05e63ca5eb747f0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
.../patches/fix-musl-build-tgkill.patch | 19 +++++++++++++++++++
srcpkgs/tracker-miners/template | 7 ++++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
new file mode 100644
index 00000000000000..0e7e3816d52963
--- /dev/null
+++ b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
@@ -0,0 +1,19 @@
+Fix build on musl, which doesn't provide a tgkill function due to concerns of it being misused.
+(e.g. outside of signal handlers)
+
+https://www.openwall.com/lists/musl/2019/08/02/1
+
+--- tracker-seccomp.c
++++ tracker-seccomp.c
+@@ -80,6 +81,11 @@
+ goto out; \
+ } G_STMT_END
+
++
++#if !defined(__GLIBC__)
++#define tgkill(pid, tid, sig) syscall(SYS_tgkill, pid, tid, sig);
++#endif
++
+ static void
+ sigsys_handler (gint signal,
+ siginfo_t *info,
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..3ed349f7c4118d 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
@@ -12,7 +12,8 @@ configure_args="-Dtracker_core=system -Dextract=true
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
-Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
-Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled
+ -Dlandlock=disabled"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
@@ -27,7 +28,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (2 preceding siblings ...)
2024-03-23 6:31 ` oreo639
@ 2024-03-23 6:31 ` oreo639
2024-03-23 22:53 ` oreo639
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 6:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 27373 bytes --]
From c9573fdd1231a5c7106187db81c25529ce63d133 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ----------------------
srcpkgs/tracker/template | 6 +-
2 files changed, 3 insertions(+), 569 deletions(-)
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 976f01a241cf84f8604fb43169756860254abff4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
.../patches/fix-musl-build-tgkill.patch | 19 +++++++++++++++++++
srcpkgs/tracker-miners/template | 7 ++++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
new file mode 100644
index 00000000000000..d36722c0ef81d1
--- /dev/null
+++ b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
@@ -0,0 +1,19 @@
+Fix build on musl, which doesn't provide a tgkill function due to concerns of it being misused.
+(e.g. outside of signal handlers)
+
+https://www.openwall.com/lists/musl/2019/08/02/1
+
+--- a/src/libtracker-miners-common/tracker-seccomp.c
++++ b/src/libtracker-miners-common/tracker-seccomp.c
+@@ -80,6 +81,11 @@
+ goto out; \
+ } G_STMT_END
+
++
++#if !defined(__GLIBC__)
++#define tgkill(pid, tid, sig) syscall(SYS_tgkill, pid, tid, sig);
++#endif
++
+ static void
+ sigsys_handler (gint signal,
+ siginfo_t *info,
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..3ed349f7c4118d 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
@@ -12,7 +12,8 @@ configure_args="-Dtracker_core=system -Dextract=true
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
-Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
-Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled
+ -Dlandlock=disabled"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
@@ -27,7 +28,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (3 preceding siblings ...)
2024-03-23 6:31 ` oreo639
@ 2024-03-23 22:53 ` oreo639
2024-03-23 22:53 ` oreo639
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression with [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (4 preceding siblings ...)
2024-03-23 22:53 ` oreo639
@ 2024-03-23 22:53 ` oreo639
2024-03-23 22:54 ` oreo639
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression where it gets tracker-fs gets stuck on [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (5 preceding siblings ...)
2024-03-23 22:53 ` oreo639
@ 2024-03-23 22:54 ` oreo639
2024-03-23 23:29 ` oreo639
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression where it gets tracker-fs gets stuck on [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328#note_2060184
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (6 preceding siblings ...)
2024-03-23 22:54 ` oreo639
@ 2024-03-23 23:29 ` oreo639
2024-03-23 23:29 ` oreo639
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression where it gets tracker-fs stalls after trying to index [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328#note_2060184
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (7 preceding siblings ...)
2024-03-23 23:29 ` oreo639
@ 2024-03-23 23:29 ` oreo639
2024-03-23 23:29 ` oreo639
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression where tracker-fs stalls after trying to index [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328#note_2060184
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (8 preceding siblings ...)
2024-03-23 23:29 ` oreo639
@ 2024-03-23 23:29 ` oreo639
2024-03-25 11:22 ` [PR PATCH] [Updated] " oreo639
2024-03-25 21:21 ` [PR PATCH] [Merged]: " oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-23 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49473#issuecomment-2016623836
Comment:
While testing this, I noticed a regression where tracker-miner-fs stalls after trying to index [ModernC.pdf](https://inria.hal.science/hal-02383654/file/ModernC.pdf): https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/328#note_2060184
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (9 preceding siblings ...)
2024-03-23 23:29 ` oreo639
@ 2024-03-25 11:22 ` oreo639
2024-03-25 21:21 ` [PR PATCH] [Merged]: " oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-25 11:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/49473
tracker: update to 3.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49473.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-49473.patch --]
[-- Type: text/x-diff, Size: 54496 bytes --]
From 0627ec3622106db5533ace5b5f8124dcb316fcfc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:03 -0700
Subject: [PATCH 1/2] tracker: update to 3.7.0.
---
srcpkgs/tracker/patches/fix-stalls.patch | 662 ++++++++++++++++++++++
srcpkgs/tracker/patches/sqlite-3.44.patch | 566 ------------------
srcpkgs/tracker/template | 6 +-
3 files changed, 665 insertions(+), 569 deletions(-)
create mode 100644 srcpkgs/tracker/patches/fix-stalls.patch
delete mode 100644 srcpkgs/tracker/patches/sqlite-3.44.patch
diff --git a/srcpkgs/tracker/patches/fix-stalls.patch b/srcpkgs/tracker/patches/fix-stalls.patch
new file mode 100644
index 00000000000000..e61e37f40e76a0
--- /dev/null
+++ b/srcpkgs/tracker/patches/fix-stalls.patch
@@ -0,0 +1,662 @@
+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 (¶ms_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 (¶ms_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
+
diff --git a/srcpkgs/tracker/patches/sqlite-3.44.patch b/srcpkgs/tracker/patches/sqlite-3.44.patch
deleted file mode 100644
index 911f0e47ce7cd5..00000000000000
--- a/srcpkgs/tracker/patches/sqlite-3.44.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 79366c42289403f4c439ee16612c32dcdbbf9a16 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 09:33:44 +0100
-Subject: [PATCH 1/5] libtracker-sparql: Decouple FTS initialization from
- ontologies
-
-Since we just need the FTS properties for fts:offsets being called
-at runtime, we can pass the TrackerDataManager (that we know early
-in startup) and let it figure out the FTS properties from there
-when it's actually needed.
-
-This is just the refactor to make that possible, there's no
-functional changes in this commit.
----
- .../core/tracker-data-manager.c | 13 +++--
- .../core/tracker-db-interface-sqlite.c | 29 ++++++-----
- .../core/tracker-db-interface-sqlite.h | 5 +-
- .../core/tracker-fts-tokenizer.c | 48 +++++++++++++++++--
- .../core/tracker-fts-tokenizer.h | 4 +-
- src/libtracker-sparql/core/tracker-fts.c | 40 ----------------
- src/libtracker-sparql/core/tracker-fts.h | 5 --
- 7 files changed, 75 insertions(+), 69 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index ef3497a834..f0797d642d 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,11 +3863,14 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- return tracker_db_interface_sqlite_fts_init (iface,
-- database,
-- manager->ontologies,
-- create,
-- error);
-+ if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-+ return FALSE;
-+ if (!create)
-+ return TRUE;
-+ return tracker_db_interface_sqlite_fts_create_table (iface,
-+ database,
-+ manager->ontologies,
-+ error);
- }
-
- static gboolean
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-index c9cdfaf29f..038197ec37 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
-@@ -37,6 +37,7 @@
- #include <libtracker-sparql/tracker-private.h>
-
- #include "tracker-fts.h"
-+#include "tracker-fts-tokenizer.h"
- #include "tracker-collation.h"
- #include "tracker-db-interface-sqlite.h"
- #include "tracker-db-manager.h"
-@@ -2029,20 +2030,26 @@ close_database (TrackerDBInterface *db_interface)
- }
-
- gboolean
--tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-- const gchar *database,
-- TrackerOntologies *ontologies,
-- gboolean create,
-- GError **error)
-+tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error)
- {
-- GError *inner_error = NULL;
-+ return tracker_tokenizer_initialize (db_interface->db,
-+ db_interface,
-+ fts_flags,
-+ db_interface->user_data,
-+ error);
-+}
-
-- if (!tracker_fts_init_db (db_interface->db, db_interface,
-- db_interface->flags, ontologies, error))
-- return FALSE;
-+gboolean
-+tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *db_interface,
-+ const gchar *database,
-+ TrackerOntologies *ontologies,
-+ GError **error)
-+{
-+ GError *inner_error = NULL;
-
-- if (create &&
-- !tracker_fts_create_table (db_interface->db, database, "fts5",
-+ if (!tracker_fts_create_table (db_interface->db, database, "fts5",
- ontologies,
- &inner_error)) {
- g_propagate_prefixed_error (error,
-diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-index 64b0be2a78..cb779ea3c7 100644
---- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
-@@ -23,6 +23,7 @@
- #include "config.h"
-
- #include "tracker-db-interface.h"
-+#include "tracker-db-manager.h"
-
- G_BEGIN_DECLS
-
-@@ -46,9 +47,11 @@ TrackerDBInterface *tracker_db_interface_sqlite_new (const gc
- gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterface *interface);
- void tracker_db_interface_sqlite_enable_shared_cache (void);
- gboolean tracker_db_interface_sqlite_fts_init (TrackerDBInterface *interface,
-+ TrackerDBManagerFlags fts_flags,
-+ GError **error);
-+gboolean tracker_db_interface_sqlite_fts_create_table (TrackerDBInterface *interface,
- const gchar *database,
- TrackerOntologies *ontologies,
-- gboolean create,
- GError **error);
- void tracker_db_interface_sqlite_reset_collator (TrackerDBInterface *interface);
- gboolean tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface,
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-index 9cf71b99f0..2e6dd0591c 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
-@@ -48,6 +48,7 @@ struct TrackerTokenizer {
-
- struct TrackerTokenizerFunctionData {
- TrackerDBInterface *interface;
-+ TrackerDataManager *data_manager;
- gchar **property_names;
- };
-
-@@ -169,6 +170,37 @@ offsets_tokenizer_func (void *data,
- return SQLITE_OK;
- }
-
-+static gboolean
-+ensure_fts_properties (TrackerTokenizerFunctionData *data)
-+{
-+ TrackerOntologies *ontologies;
-+ TrackerProperty **properties;
-+ GArray *property_names;
-+ guint i, len;
-+
-+ if (data->property_names)
-+ return data->property_names[0] != NULL;
-+
-+ ontologies = tracker_data_manager_get_ontologies (data->data_manager);
-+
-+ property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-+ properties = tracker_ontologies_get_properties (ontologies, &len);
-+
-+ for (i = 0; i < len; i++) {
-+ gchar *column;
-+
-+ if (!tracker_property_get_fulltext_indexed (properties[i]))
-+ continue;
-+
-+ column = g_strdup (tracker_property_get_name (properties[i]));
-+ g_array_append_val (property_names, column);
-+ }
-+
-+ data->property_names = (gchar **) g_array_free (property_names, FALSE);
-+
-+ return data->property_names[0] != NULL;
-+}
-+
- static void
- tracker_offsets_function (const Fts5ExtensionApi *api,
- Fts5Context *fts_ctx,
-@@ -189,6 +221,12 @@ tracker_offsets_function (const Fts5ExtensionApi *api,
- }
-
- data = api->xUserData (fts_ctx);
-+
-+ if (!ensure_fts_properties (data)) {
-+ sqlite3_result_null (ctx);
-+ return;
-+ }
-+
- rc = api->xInstCount (fts_ctx, &n_hits);
-
- if (rc != SQLITE_OK) {
-@@ -296,14 +334,14 @@ error:
- }
-
- static TrackerTokenizerFunctionData *
--tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-- const gchar **property_names)
-+tracker_tokenizer_function_data_new (TrackerDBInterface *interface,
-+ TrackerDataManager *data_manager)
- {
- TrackerTokenizerFunctionData *data;
-
- data = g_new0 (TrackerTokenizerFunctionData, 1);
- data->interface = interface;
-- data->property_names = g_strdupv ((gchar **) property_names);
-+ data->data_manager = data_manager;
-
- return data;
- }
-@@ -319,7 +357,7 @@ gboolean
- tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error)
- {
- TrackerTokenizerData *data;
-@@ -338,7 +376,7 @@ tracker_tokenizer_initialize (sqlite3 *db,
- tracker_tokenizer_data_free);
-
- /* Offsets */
-- func_data = tracker_tokenizer_function_data_new (interface, property_names);
-+ func_data = tracker_tokenizer_function_data_new (interface, data_manager);
- api->xCreateFunction (api, "tracker_offsets", func_data,
- &tracker_offsets_function,
- (GDestroyNotify) tracker_tokenizer_function_data_free);
-diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-index 57bca46a56..76e0bbcbb9 100644
---- a/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
-@@ -22,7 +22,7 @@
- #include <sqlite3.h>
- #include <glib.h>
-
--#include "tracker-db-manager.h"
-+#include "tracker-data-manager.h"
-
- #ifndef __TRACKER_FTS_TOKENIZER_H__
- #define __TRACKER_FTS_TOKENIZER_H__
-@@ -30,7 +30,7 @@
- gboolean tracker_tokenizer_initialize (sqlite3 *db,
- TrackerDBInterface *interface,
- TrackerDBManagerFlags flags,
-- const gchar **property_names,
-+ TrackerDataManager *data_manager,
- GError **error);
-
- #endif /* __TRACKER_FTS_TOKENIZER_H__ */
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 96ec9e9e76..f622855ee4 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -43,46 +43,6 @@ has_fts_properties (TrackerOntologies *ontologies)
- return FALSE;
- }
-
--static gchar **
--get_fts_properties (TrackerOntologies *ontologies)
--{
-- TrackerProperty **properties;
-- GArray *property_names;
-- guint i, len;
--
-- property_names = g_array_new (TRUE, FALSE, sizeof (gchar *));
-- properties = tracker_ontologies_get_properties (ontologies, &len);
--
-- for (i = 0; i < len; i++) {
-- gchar *column;
--
-- if (!tracker_property_get_fulltext_indexed (properties[i]))
-- continue;
--
-- column = g_strdup (tracker_property_get_name (properties[i]));
-- g_array_append_val (property_names, column);
-- }
--
-- return (gchar **) g_array_free (property_names, FALSE);
--}
--
--gboolean
--tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error)
--{
-- gchar **property_names;
-- gboolean retval;
--
-- property_names = get_fts_properties (ontologies);
-- retval = tracker_tokenizer_initialize (db, interface, flags, (const gchar **) property_names, error);
-- g_strfreev (property_names);
--
-- return retval;
--}
--
- gboolean
- tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
-diff --git a/src/libtracker-sparql/core/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
-index 4370d3f667..cf3e1d9cbd 100644
---- a/src/libtracker-sparql/core/tracker-fts.h
-+++ b/src/libtracker-sparql/core/tracker-fts.h
-@@ -30,11 +30,6 @@
-
- G_BEGIN_DECLS
-
--gboolean tracker_fts_init_db (sqlite3 *db,
-- TrackerDBInterface *interface,
-- TrackerDBManagerFlags flags,
-- TrackerOntologies *ontologies,
-- GError **error);
- gboolean tracker_fts_create_table (sqlite3 *db,
- const gchar *database,
- gchar *table_name,
---
-GitLab
-
-
-From 9e53773a056f84e5042dec56db18cd409c96f41b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:16:16 +0100
-Subject: [PATCH 2/5] libtracker-sparql: Move FTS initialization to an earlier
- stage
-
-With SQLite >= 3.44.x, the check_integrity pragma may involve existing
-virtual tables and their xIntegrity vmethod. This includes FTS5 tables,
-so we need to set up the FTS5 tokenizer at an earlier stage, so that
-possible integrity checks happening on startup have everything set up.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/418
----
- src/libtracker-sparql/core/tracker-data-manager.c | 2 --
- src/libtracker-sparql/core/tracker-db-manager.c | 5 +++++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index f0797d642d..dff6b66542 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3863,8 +3863,6 @@ tracker_data_manager_init_fts (TrackerDataManager *manager,
- gboolean create,
- GError **error)
- {
-- if (!tracker_db_interface_sqlite_fts_init (iface, manager->flags, error))
-- return FALSE;
- if (!create)
- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
-diff --git a/src/libtracker-sparql/core/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
-index 6952af082b..8427ed71b7 100644
---- a/src/libtracker-sparql/core/tracker-db-manager.c
-+++ b/src/libtracker-sparql/core/tracker-db-manager.c
-@@ -783,6 +783,11 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
- return NULL;
- }
-
-+ if (!tracker_db_interface_sqlite_fts_init (connection,
-+ db_manager->flags,
-+ error))
-+ return FALSE;
-+
- tracker_db_interface_set_max_stmt_cache_size (connection,
- TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT,
- db_manager->s_cache_size);
---
-GitLab
-
-
-From f9b246f40dc0f1b229cc87c0e1987fd77779ad7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:21:18 +0100
-Subject: [PATCH 3/5] libtracker-sparql: Avoid regression in renaming FTS5
- tables
-
-SQLite 3.44.x has a regression with the renaming of FTS5 tables
-within a transaction (https://sqlite.org/forum/forumpost?udc=1&name=4dbfcd293d).
-
-While this change has a workaround smell, we actually do not need the
-tables to be renamed, since we drop+create the FTS5 tables if ontology
-changes affect FTS fields. The original table is already ensured to be
-dropped when we "alter" the FTS table. Avoiding this rename will work
-for all SQLite versions.
----
- src/libtracker-sparql/core/tracker-fts.c | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index f622855ee4..1171dc11a8 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -191,21 +191,17 @@ tracker_fts_alter_table (sqlite3 *db,
- TrackerOntologies *ontologies,
- GError **error)
- {
-- gchar *query, *tmp_name;
-+ gchar *query;
- int rc;
-
- if (!has_fts_properties (ontologies))
- return TRUE;
-
-- tmp_name = g_strdup_printf ("%s_TMP", table_name);
--
-- if (!tracker_fts_create_table (db, database, tmp_name, ontologies, error)) {
-- g_free (tmp_name);
-+ if (!tracker_fts_create_table (db, database, table_name, ontologies, error))
- return FALSE;
-- }
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s (rowid) SELECT rowid FROM fts_view",
-- database, tmp_name);
-+ database, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
-@@ -213,21 +209,14 @@ tracker_fts_alter_table (sqlite3 *db,
- goto error;
-
- query = g_strdup_printf ("INSERT INTO \"%s\".%s(%s) VALUES('rebuild')",
-- database, tmp_name, tmp_name);
-+ database, table_name, table_name);
- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
- g_free (query);
-
- if (rc != SQLITE_OK)
- goto error;
-
-- query = g_strdup_printf ("ALTER TABLE \"%s\".%s RENAME TO %s",
-- database, tmp_name, table_name);
-- rc = sqlite3_exec (db, query, NULL, NULL, NULL);
-- g_free (query);
--
- error:
-- g_free (tmp_name);
--
- if (rc != SQLITE_OK) {
- g_set_error (error,
- TRACKER_DB_INTERFACE_ERROR,
---
-GitLab
-
-
-From aea3bd3b0483dc76e9cd20e7e8c207ff5112c722 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 7 Dec 2023 10:33:52 +0100
-Subject: [PATCH 4/5] libtracker-sparql: Refactor FTS table creation calls
-
-Since we used to initialize FTS and create tables in one shot, the
-function involved had a "create" argument to specify whether tables
-had to be created, or they were there already.
-
-Since FTS initialization moved elsewhere, this argument in this function
-is just an early return. We can avoid the calls in the first place where
-that argument is FALSE (i.e. regular initialization paths on an already
-existing database).
-
-This is a refactor with no functional changes.
----
- .../core/tracker-data-manager.c | 24 ++++---------------
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
-index dff6b66542..98426eb9b3 100644
---- a/src/libtracker-sparql/core/tracker-data-manager.c
-+++ b/src/libtracker-sparql/core/tracker-data-manager.c
-@@ -3860,11 +3860,8 @@ static gboolean
- tracker_data_manager_init_fts (TrackerDataManager *manager,
- TrackerDBInterface *iface,
- const gchar *database,
-- gboolean create,
- GError **error)
- {
-- if (!create)
-- return TRUE;
- return tracker_db_interface_sqlite_fts_create_table (iface,
- database,
- manager->ontologies,
-@@ -3959,18 +3956,11 @@ tracker_data_manager_initialize_iface (TrackerDataManager *data_manager,
- iface, value, FALSE,
- error))
- goto error;
--
-- if (!tracker_data_manager_init_fts (data_manager, iface,
-- value, FALSE, error))
-- goto error;
- }
-
- g_hash_table_unref (graphs);
- }
-
-- if (!tracker_data_manager_init_fts (data_manager, iface, "main", FALSE, error))
-- return FALSE;
--
- return TRUE;
- error:
- g_clear_pointer (&graphs, g_hash_table_unref);
-@@ -4367,7 +4357,7 @@ tracker_data_manager_initable_init (GInitable *initable,
- goto rollback_newly_created_db;
- }
-
-- if (!tracker_data_manager_init_fts (manager, iface, "main", TRUE, &internal_error)) {
-+ if (!tracker_data_manager_init_fts (manager, iface, "main", &internal_error)) {
- g_propagate_error (error, internal_error);
- goto rollback_newly_created_db;
- }
-@@ -4710,11 +4700,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- if (ontology_error)
- break;
-
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, value, &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, value, FALSE, &ontology_error);
-- }
-
- if (ontology_error)
- break;
-@@ -4724,11 +4711,8 @@ tracker_data_manager_initable_init (GInitable *initable,
- }
-
- if (!ontology_error) {
-- if (update_fts) {
-+ if (update_fts)
- tracker_data_manager_update_fts (manager, iface, "main", &ontology_error);
-- } else {
-- tracker_data_manager_init_fts (manager, iface, "main", FALSE, &ontology_error);
-- }
- }
-
- if (!ontology_error) {
-@@ -5094,7 +5078,7 @@ tracker_data_manager_create_graph (TrackerDataManager *manager,
- FALSE, error))
- goto detach;
-
-- if (!tracker_data_manager_init_fts (manager, iface, name, TRUE, error))
-+ if (!tracker_data_manager_init_fts (manager, iface, name, error))
- goto detach;
-
- id = tracker_data_ensure_graph (manager->data_update, name, error);
---
-GitLab
-
-
-From c34c49c2e7ec97aac4ab0bd8cc083c1b2ebbdd7d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 8 Dec 2023 14:37:54 +0100
-Subject: [PATCH 5/5] libtracker-common: Trigger rebuild of FTS table
-
-Should there be any actual broken state in the FTS table after
-the failed integrity check, this will take care of it.
----
- src/libtracker-common/tracker-parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
-index 9c40fab2d7..6a4537a48f 100644
---- a/src/libtracker-common/tracker-parser.h
-+++ b/src/libtracker-common/tracker-parser.h
-@@ -30,7 +30,7 @@
- * at runtime, the former must be rebuilt for those to match perfectly
- * to avoid returning meaningless results on FTS searches.
- */
--#define TRACKER_PARSER_VERSION 5
-+#define TRACKER_PARSER_VERSION 6
-
- G_BEGIN_DECLS
-
---
-GitLab
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 68b3b62ec71eec..5ec54a72b21dcf 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -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=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
+checksum=46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 9dfec3a625a3dd07a27c93f04129a3d73428ff9c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 22 Mar 2024 22:31:35 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.7.0.
---
.../patches/fix-musl-build-tgkill.patch | 19 ++++++++++
.../patches/xmp-ignore-invalid-dcsource.patch | 35 +++++++++++++++++++
srcpkgs/tracker-miners/template | 7 ++--
3 files changed, 58 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
create mode 100644 srcpkgs/tracker-miners/patches/xmp-ignore-invalid-dcsource.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
new file mode 100644
index 00000000000000..d36722c0ef81d1
--- /dev/null
+++ b/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
@@ -0,0 +1,19 @@
+Fix build on musl, which doesn't provide a tgkill function due to concerns of it being misused.
+(e.g. outside of signal handlers)
+
+https://www.openwall.com/lists/musl/2019/08/02/1
+
+--- a/src/libtracker-miners-common/tracker-seccomp.c
++++ b/src/libtracker-miners-common/tracker-seccomp.c
+@@ -80,6 +81,11 @@
+ goto out; \
+ } G_STMT_END
+
++
++#if !defined(__GLIBC__)
++#define tgkill(pid, tid, sig) syscall(SYS_tgkill, pid, tid, sig);
++#endif
++
+ static void
+ sigsys_handler (gint signal,
+ siginfo_t *info,
diff --git a/srcpkgs/tracker-miners/patches/xmp-ignore-invalid-dcsource.patch b/srcpkgs/tracker-miners/patches/xmp-ignore-invalid-dcsource.patch
new file mode 100644
index 00000000000000..a5ea74126cacc6
--- /dev/null
+++ b/srcpkgs/tracker-miners/patches/xmp-ignore-invalid-dcsource.patch
@@ -0,0 +1,35 @@
+From 27b8a83c94ea6b3d5efab78b71e050f32f2de927 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun, 24 Mar 2024 01:09:13 +0100
+Subject: [PATCH 2/2] tracker-extract: Do not accept non-URI dc:source in XMP
+
+Our ontology requires this property to be a rdfs:Resource, trying
+to insert random strings as IRIs will not work, so ignore the dc:source
+in that case.
+---
+ src/libtracker-extract/tracker-xmp.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
+index a0eca15eb..13c21f3cb 100644
+--- a/src/libtracker-extract/tracker-xmp.c
++++ b/src/libtracker-extract/tracker-xmp.c
+@@ -489,7 +489,14 @@ iterate_simple (const gchar *uri,
+ } else if (!data->identifier && g_ascii_strcasecmp (name, "identifier") == 0) {
+ data->identifier = g_strdup (value);
+ } else if (!data->source && g_ascii_strcasecmp (name, "source") == 0) {
+- data->source = g_strdup (value);
++ gchar *uri_scheme;
++
++ uri_scheme = g_uri_parse_scheme (value);
++ if (uri_scheme != NULL) {
++ /* Source seems to be a full URI */
++ data->source = g_strdup (value);
++ g_free (uri_scheme);
++ }
+ } else if (!data->language && g_ascii_strcasecmp (name, "language") == 0) {
+ data->language = g_strdup (value);
+ } else if (!data->relation && g_ascii_strcasecmp (name, "relation") == 0) {
+--
+GitLab
+
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 0ae1cb0a986bdd..3ed349f7c4118d 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.6.2
+version=3.7.0
revision=1
build_style=meson
build_helper=qemu
@@ -12,7 +12,8 @@ configure_args="-Dtracker_core=system -Dextract=true
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
-Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
-Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled
+ -Dlandlock=disabled"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
@@ -27,7 +28,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff
+checksum=74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: tracker: update to 3.7.0.
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
` (10 preceding siblings ...)
2024-03-25 11:22 ` [PR PATCH] [Updated] " oreo639
@ 2024-03-25 21:21 ` oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-03-25 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1183 bytes --]
There's a merged pull request on the void-packages repository
tracker: update to 3.7.0.
https://github.com/void-linux/void-packages/pull/49473
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes tracker with glib 2.80: https://github.com/void-linux/void-packages/pull/49446
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-03-25 21:21 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-23 5:36 [PR PATCH] tracker: update to 3.7.0 oreo639
2024-03-23 5:50 ` [PR PATCH] [Updated] " oreo639
2024-03-23 5:51 ` oreo639
2024-03-23 6:31 ` oreo639
2024-03-23 6:31 ` oreo639
2024-03-23 22:53 ` oreo639
2024-03-23 22:53 ` oreo639
2024-03-23 22:54 ` oreo639
2024-03-23 23:29 ` oreo639
2024-03-23 23:29 ` oreo639
2024-03-23 23:29 ` oreo639
2024-03-25 11:22 ` [PR PATCH] [Updated] " oreo639
2024-03-25 21:21 ` [PR PATCH] [Merged]: " oreo639
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).