colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

akonadi: update patches

Browse Source
This commit is contained in:
Thomas Tuegel 2021-04-25 08:05:06 -05:00
parent e8ee87ded0
commit 13ab0c27a1
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
View File

@ -1,6 +1,6 @@
From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001 From ca8ff6e6d527ee968300cce5e8cd148f6a4d256b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:03 -0600 Date: Sun, 25 Apr 2021 08:00:10 -0500
Subject: [PATCH 1/3] akonadi paths Subject: [PATCH 1/3] akonadi paths
--- ---
@ -11,45 +11,45 @@ Subject: [PATCH 1/3] akonadi paths
4 files changed, 11 insertions(+), 40 deletions(-) 4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 31e0cf2..6436e87 100644 index 44ceec5..eb5fa50 100644
--- a/src/akonadicontrol/agentmanager.cpp --- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp +++ b/src/akonadicontrol/agentmanager.cpp
@@ -48,7 +48,7 @@ public: @@ -47,7 +47,7 @@ public:
[]() { connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
QCoreApplication::instance()->exit(255); QCoreApplication::instance()->exit(255);
}); });
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); - start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); + start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/akonadiserver"), args, RestartOnCrash);
} }
~StorageProcessControl() override ~StorageProcessControl() override
@@ -70,7 +70,7 @@ public: @@ -69,7 +69,7 @@ public:
[]() { connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
}); });
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); - start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); + start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/akonadi_agent_server"), args, RestartOnCrash);
} }
~AgentServerProcessControl() override ~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index c98946c..aa307ca 100644 index 8e92e08..f98dfd8 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp --- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp +++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) @@ -47,7 +47,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else { } else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier(); const QStringList arguments = QStringList() << executable << identifier();
- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); - const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + const QString agentLauncherExec = QLatin1String(CMAKE_INSTALL_FULL_BINDIR "/akonadi_agent_launcher");
mController->start(agentLauncherExec, arguments); mController->start(agentLauncherExec, arguments);
} }
return true; return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index d595a3a..99324f6 100644 index 1a437ac..3550f9d 100644
--- a/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -72,7 +72,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -57,7 +57,7 @@ index d595a3a..99324f6 100644
QString defaultCleanShutdownCommand; QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -80,16 +79,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif #endif
const bool defaultInternalServer = true; const bool defaultInternalServer = true;
@ -75,7 +75,7 @@ index d595a3a..99324f6 100644
if (!mysqladminPath.isEmpty()) { if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -99,10 +89,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif #endif
} }
@ -88,7 +88,7 @@ index d595a3a..99324f6 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -119,7 +109,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -97,7 +97,7 @@ index d595a3a..99324f6 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup(); settings.endGroup();
@@ -127,9 +117,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -129,9 +119,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode // intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi"); mDatabaseName = QStringLiteral("akonadi");
} }
@ -107,7 +107,7 @@ index d595a3a..99324f6 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -141,9 +128,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -117,20 +117,20 @@ index d595a3a..99324f6 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer() @@ -215,7 +199,7 @@ bool DbConfigMysql::startInternalServer()
#endif #endif
// generate config file // generate config file
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); - const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); + const QString globalConfig = QLatin1String(CMAKE_INSTALL_PREFIX "/etc/xdg/akonadi/mysql-global.conf");
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) { if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index dd273fc..05288d9 100644 index 4df61da..e3469c4 100644
--- a/src/server/storage/dbconfigpostgresql.cpp --- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp +++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -125,9 +125,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -140,7 +140,7 @@ index dd273fc..05288d9 100644
QString defaultPgData; QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -138,12 +136,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) { if (mInternalServer) {
@ -154,7 +154,7 @@ index dd273fc..05288d9 100644
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
} }
@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -162,20 +156,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -177,7 +177,7 @@ index dd273fc..05288d9 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) { if (mPgData.isEmpty()) {
@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -192,7 +180,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Port"), mHostPort); settings.setValue(QStringLiteral("Port"), mHostPort);
} }
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -186,5 +186,5 @@ index dd273fc..05288d9 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
-- --
2.29.2 2.31.1

14
pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
View File

@ -1,6 +1,6 @@
From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001 From f6c446cf6fab2edbd2606b4c6100903e9437362a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:15 -0600 Date: Sun, 25 Apr 2021 08:01:02 -0500
Subject: [PATCH 2/3] akonadi timestamps Subject: [PATCH 2/3] akonadi timestamps
--- ---
@ -8,19 +8,19 @@ Subject: [PATCH 2/3] akonadi timestamps
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 99324f6..3c170a8 100644 index 3550f9d..e9e8887 100644
--- a/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer() @@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false; bool confUpdate = false;
QFile actualFile(actualConfig); QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual // update conf only if either global (or local) is newer than actual
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || - if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { - || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+ if (true) { + if (true) {
QFile globalFile(globalConfig); QFile globalFile(globalConfig);
QFile localFile(localConfig); QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
-- --
2.29.2 2.31.1

10
pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
View File

@ -1,6 +1,6 @@
From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001 From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:01:24 -0600 Date: Sun, 25 Apr 2021 08:01:21 -0500
Subject: [PATCH 3/3] akonadi revert make relocatable Subject: [PATCH 3/3] akonadi revert make relocatable
--- ---
@ -9,10 +9,10 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
2 files changed, 3 insertions(+), 6 deletions(-) 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb5fec..35720b4 100644 index 4e8cc81..63161b7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -343,9 +343,6 @@ configure_package_config_file( @@ -368,9 +368,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -41,5 +41,5 @@ index bcf7320..1574319 100644
# set the directories # set the directories
if(NOT AKONADI_INSTALL_DIR) if(NOT AKONADI_INSTALL_DIR)
-- --
2.29.2 2.31.1

5
pkgs/applications/kde/akonadi/default.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam, substituteAll,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
@ -34,7 +34,4 @@ mkDerivation {
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
]; ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
'';
} }