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

akonadi: do not store path to mysqld in configuration

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-18 18:28:17 -05:00
parent 3acfd31050
commit be9a4fe6ca
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/applications/kde/akonadi/akonadi-paths.patch
View File

@ -2,10 +2,23 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
=================================================================== ===================================================================
--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp --- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
@@ -76,20 +76,11 @@ bool DbConfigMysql::init(QSettings &sett @@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett
defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); // determine default settings depending on the driver
} QString defaultHostName;
QString defaultOptions;
- QString defaultServerPath;
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett
#endif #endif
const bool defaultInternalServer = true;
-#ifdef MYSQLD_EXECUTABLE
- if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
- defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
- }
-#endif
- const QStringList mysqldSearchPath = QStringList() - const QStringList mysqldSearchPath = QStringList()
- << QStringLiteral("/usr/bin") - << QStringLiteral("/usr/bin")
- << QStringLiteral("/usr/sbin") - << QStringLiteral("/usr/sbin")
@ -15,17 +28,16 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
- << QStringLiteral("/opt/mysql/libexec") - << QStringLiteral("/opt/mysql/libexec")
- << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/local/lib/mysql5/bin")
- << QStringLiteral("/opt/mysql/sbin"); - << QStringLiteral("/opt/mysql/sbin");
if (defaultServerPath.isEmpty()) { - if (defaultServerPath.isEmpty()) {
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); - defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
+ defaultServerPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD); - }
}
- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); - const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN); + const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
if (!mysqladminPath.isEmpty()) { if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
@@ -99,10 +90,10 @@ bool DbConfigMysql::init(QSettings &sett @@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett
#endif #endif
} }
@ -38,7 +50,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
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();
@@ -119,7 +110,7 @@ bool DbConfigMysql::init(QSettings &sett @@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett
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();
@ -47,7 +59,27 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup(); settings.endGroup();
@@ -196,7 +187,7 @@ bool DbConfigMysql::startInternalServer( @@ -129,9 +111,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;
@@ -140,9 +119,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();
@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer(
#endif #endif
// generate config file // generate config file