diff options
| author |   Johannes Huber <johu@gentoo.org> | 2016-12-16 19:38:26 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2016-12-16 19:38:38 +0100 |
| commit | 31645664f42a588800ba68febd89a9c9e6afc76f (patch) | |
| tree | ccc391e5d2b2b2255adcafe060246a5ddf9a3396 /kde-apps/akonadi/files | |
| parent | profiles: Update masks for KDE Applications 16.12 (diff) | |
| download | gentoo-31645664f42a588800ba68febd89a9c9e6afc76f.tar.gz gentoo-31645664f42a588800ba68febd89a9c9e6afc76f.tar.bz2 gentoo-31645664f42a588800ba68febd89a9c9e6afc76f.zip | |
kde-apps: Version bump KDE Applications 16.12.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-apps/akonadi/files')
| -rw-r--r-- | kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch new file mode 100644 index 000000000000..8f33abb246d6 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch @@ -0,0 +1,39 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 5cfaa33..1d1ea02 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) + << QStringLiteral("/usr/local/sbin") + << QStringLiteral("/usr/local/libexec") + << QStringLiteral("/usr/libexec") ++ << QStringLiteral("/usr/share/mysql/scripts") + << QStringLiteral("/opt/mysql/libexec") + << QStringLiteral("/opt/local/lib/mysql5/bin") + << QStringLiteral("/opt/mysql/sbin"); +@@ -512,7 +513,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt + return 0 == execute(mMysqlInstallDbPath, + { QStringLiteral("--defaults-file=%1").arg(confFile), + QStringLiteral("--force"), +- QStringLiteral("--basedir=%1").arg(baseDir), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) }); + } + +@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const + return 0 == execute(mMysqldPath, + { QStringLiteral("--defaults-file=%1").arg(confFile), + QStringLiteral("--initialize"), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) }); + } + +@@ -538,6 +540,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri + // Don't use --force, it has been removed in MySQL 5.7.5 + return 0 == execute(mMysqlInstallDbPath, + { QStringLiteral("--defaults-file=%1").arg(confFile), +- QStringLiteral("--basedir=%1").arg(baseDir), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) }); + } |