[neon/kde/akonadi/Neon/release-lts] debian/patches: refresh patch

Jonathan Riddell null at kde.org
Wed Oct 7 14:04:42 BST 2020


Git commit 94e5bc872d08a095f058a577a9c36dc258d6fad7 by Jonathan Riddell.
Committed on 07/10/2020 at 13:04.
Pushed by jriddell into branch 'Neon/release-lts'.

refresh patch

M  +7    -7    debian/patches/postgresql-data-checksums.patch

https://invent.kde.org/neon/kde/akonadi/commit/94e5bc872d08a095f058a577a9c36dc258d6fad7

diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index b8aecae..f0b465d 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -6,15 +6,15 @@ Subject: postgresql-data-checksums
  src/server/storage/dbconfigpostgresql.cpp | 1 +
  1 file changed, 1 insertion(+)
 
-Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
+Index: akonadi-20.08.2/src/server/storage/dbconfigpostgresql.cpp
 ===================================================================
---- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp
-+++ akonadi/src/server/storage/dbconfigpostgresql.cpp
-@@ -294,6 +294,7 @@ bool DbConfigPostgresql::runInitDb(const
+--- akonadi-20.08.2.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-20.08.2/src/server/storage/dbconfigpostgresql.cpp
+@@ -281,6 +281,7 @@ bool DbConfigPostgresql::runInitDb(const
  
      // call 'initdb --pgdata=/home/user/.local/share/akonadi/data_db'
      return execute(mInitDbPath, { QStringLiteral("--pgdata=%1").arg(newDbPath),
 +                                  QStringLiteral("--data-checksums"),
-                                   QStringLiteral("--locale=en_US.UTF-8") /* TODO: check locale */ }) == 0;
- }
- 
+                                   QStringLiteral("--encoding=UTF8"),
+                                   QStringLiteral("--no-locale")
+                                 }) == 0;



More information about the Neon-commits mailing list