diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-01 23:26:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-01 23:26:57 +0200 |
| commit | 58863b93b0d9a191d5cca695fe0a0dfbb067ebba (patch) | |
| tree | 1ee1aba5905862aaee952689e59dd2d8a9e2fce6 /gnu/packages/patches/akonadi-timestamps.patch | |
| parent | 2e559a358582fd8f56a035d0fac97be229752dfb (diff) | |
| parent | 0c518f974e64f23846ae51ea2c68b479202fdca9 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/akonadi-timestamps.patch')
| -rw-r--r-- | gnu/packages/patches/akonadi-timestamps.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/patches/akonadi-timestamps.patch b/gnu/packages/patches/akonadi-timestamps.patch index e299a6991f..df81fdb2dc 100644 --- a/gnu/packages/patches/akonadi-timestamps.patch +++ b/gnu/packages/patches/akonadi-timestamps.patch @@ -2,12 +2,12 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp =================================================================== --- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp +++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( +@@ -260,8 +260,7 @@ bool DbConfigMysql::startInternalServer( bool confUpdate = false; QFile actualFile(actualConfig); // update conf only if either global (or local) is newer than actual -- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || -- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) +- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { + if (true) { QFile globalFile(globalConfig); QFile localFile(localConfig); |