aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch')
-rw-r--r--nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch172
1 files changed, 0 insertions, 172 deletions
diff --git a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch
deleted file mode 100644
index ba6bbedeeae..00000000000
--- a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp
-+++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
-@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
- mStorageController = new Akonadi::ProcessControl;
- mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
- connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
-- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-
- if (mAgentServerEnabled) {
- mAgentServer = new Akonadi::ProcessControl;
- connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
-- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
- }
- }
-
-Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp
-+++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
- } else {
- Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
- const QStringList arguments = QStringList() << executable << identifier();
-- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
-+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
- mController->start(agentLauncherExec, arguments);
- }
- return true;
-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
-@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett
- // determine default settings depending on the driver
- QString defaultHostName;
- QString defaultOptions;
-- QString defaultServerPath;
- QString defaultCleanShutdownCommand;
-
- #ifndef Q_OS_WIN
-@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett
- #endif
-
- const bool defaultInternalServer = true;
--#ifdef MYSQLD_EXECUTABLE
-- if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
-- defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
-- }
--#endif
-- if (defaultServerPath.isEmpty()) {
-- defaultServerPath = findExecutable(QStringLiteral("mysqld"));
-- }
--
-- const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin"));
-+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
- if (!mysqladminPath.isEmpty()) {
- #ifndef Q_OS_WIN
- defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
-@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett
- #endif
- }
-
-- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db"));
-+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
- qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
-
-- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck"));
-+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
- qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
-
- mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett
- mUserName = settings.value(QStringLiteral("User")).toString();
- mPassword = settings.value(QStringLiteral("Password")).toString();
- mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
-- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
-+ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
- mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
- settings.endGroup();
-
-@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett
- // intentionally not namespaced as we are the only one in this db instance when using internal mode
- mDatabaseName = QStringLiteral("akonadi");
- }
-- if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) {
-- mMysqldPath = defaultServerPath;
-- }
-
- qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
-
-@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett
- settings.setValue(QStringLiteral("Name"), mDatabaseName);
- settings.setValue(QStringLiteral("Host"), mHostName);
- settings.setValue(QStringLiteral("Options"), mConnectionOptions);
-- if (!mMysqldPath.isEmpty()) {
-- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
-- }
- settings.setValue(QStringLiteral("StartServer"), mInternalServer);
- settings.endGroup();
- settings.sync();
-@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer(
- #endif
-
- // generate config file
-- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
-+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
- const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
- const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
- if (globalConfig.isEmpty()) {
-Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp
-+++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
-@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings
- // determine default settings depending on the driver
- QString defaultHostName;
- QString defaultOptions;
-- QString defaultServerPath;
- QString defaultInitDbPath;
-- QString defaultPgUpgradePath;
- QString defaultPgData;
-
- #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
-@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings
-
- mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
- if (mInternalServer) {
-- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
--
-- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths);
-- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths);
-+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
- defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
-- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
- defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
- }
-
-@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings
- mUserName = settings.value(QStringLiteral("User")).toString();
- mPassword = settings.value(QStringLiteral("Password")).toString();
- mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
-- mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
-- if (mInternalServer && mServerPath.isEmpty()) {
-- mServerPath = defaultServerPath;
-- }
-+ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
- qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
- mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
- if (mInternalServer && mInitDbPath.isEmpty()) {
- mInitDbPath = defaultInitDbPath;
- }
- qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath;
-- mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString();
-- if (mInternalServer && mPgUpgradePath.isEmpty()) {
-- mPgUpgradePath = defaultPgUpgradePath;
-- }
-+ mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE);
- qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
- mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
- if (mPgData.isEmpty()) {
-@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings
- settings.setValue(QStringLiteral("Port"), mHostPort);
- }
- settings.setValue(QStringLiteral("Options"), mConnectionOptions);
-- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
- settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
- settings.setValue(QStringLiteral("StartServer"), mInternalServer);
- settings.endGroup();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 11:33:04 +0000