diff options
| author | Robert Clausecker <fuz@FreeBSD.org> | 2024-04-08 11:52:26 +0200 |
|---|---|---|
| committer | Robert Clausecker <fuz@FreeBSD.org> | 2024-04-12 10:36:56 +0200 |
| commit | 50154e657e63e12df3938dcd7dc15b7e340f5a6f (patch) | |
| tree | 14201596e8608f1955dcdda3e9c886ac03970fe9 /databases/evolution-data-server/files | |
| parent | devel/go-tools: update to 0.20.0 (diff) | |
databases/evolution-data-server: make usable when sqlite3 has option DQS disabled
This port uses "%s" in some SQL queries where '%s' should have been
used. When the DQS (double-quoted string) misfeatures of SQLite3 is
disabled, these queries fail and cause the error "no such column: %s".
Change these queries to fix evolution.
PR: 278249
Approved by: fluffy (gnome)
MFH: 2024Q2
Diffstat (limited to 'databases/evolution-data-server/files')
| -rw-r--r-- | databases/evolution-data-server/files/patch-src_camel_camel-db.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/databases/evolution-data-server/files/patch-src_camel_camel-db.c b/databases/evolution-data-server/files/patch-src_camel_camel-db.c new file mode 100644 index 000000000000..2ff44c2cb5e8 --- /dev/null +++ b/databases/evolution-data-server/files/patch-src_camel_camel-db.c @@ -0,0 +1,36 @@ +Allow evolution to be used when databases/sqlite3 has been compiled +with option DQS disabled. + +--- src/camel/camel-db.c.orig 2024-04-08 09:37:09 UTC ++++ src/camel/camel-db.c +@@ -1823,8 +1823,8 @@ camel_db_migrate_folder_prepare (CamelDB *cdb, + "mail_to , mail_cc , mlist , followup_flag , " + "followup_completed_on , followup_due_by , " + "part , labels , usertags , cinfo , bdata , '', '', " +- "strftime(\"%%s\", 'now'), " +- "strftime(\"%%s\", 'now') FROM %Q", ++ "strftime('%%s', 'now'), " ++ "strftime('%%s', 'now') FROM %Q", + folder_name, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, error); + sqlite3_free (table_creation_query); +@@ -2093,8 +2093,8 @@ camel_db_write_message_info_record (CamelDB *cdb, + "%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, " + "%Q, %Q, %Q, %Q, %Q, %Q, %Q, " +- "strftime(\"%%s\", 'now'), " +- "strftime(\"%%s\", 'now') )", ++ "strftime('%%s', 'now'), " ++ "strftime('%%s', 'now') )", + folder_name, + record->uid, + record->flags, +@@ -2578,7 +2578,7 @@ camel_db_rename_folder (CamelDB *cdb, + ret = camel_db_add_to_transaction (cdb, cmd, error); + sqlite3_free (cmd); + +- cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime(\"%%s\", 'now'), created=strftime(\"%%s\", 'now')", new_folder_name); ++ cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime('%%s', 'now'), created=strftime('%%s', 'now')", new_folder_name); + ret = camel_db_add_to_transaction (cdb, cmd, error); + sqlite3_free (cmd); + |