diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-26 21:15:54 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-26 21:28:44 +0100 |
| commit | 03848542392d626356b8c6ad37cd217b29e168f1 (patch) | |
| tree | bec41ab0831ec626477dcce60765dcbb23c451dd | |
| parent | 444c3bf64cdf8373cd0c8021b4bca9a1dbfaf9d5 (diff) | |
| download | kde-03848542392d626356b8c6ad37cd217b29e168f1.tar.gz kde-03848542392d626356b8c6ad37cd217b29e168f1.tar.bz2 kde-03848542392d626356b8c6ad37cd217b29e168f1.zip | |
kde-apps/akonadi: Rebase mysql56 patch onto 19.03.80
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-apps/akonadi/akonadi-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch | 52 |
2 files changed, 53 insertions, 1 deletions
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index afeedcf9283..169ec3761b6 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND} # some akonadi tests time out, that probably needs more work as it's ~700 tests RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) +PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" ) pkg_setup() { # Set default storage backend in order: MySQL, PostgreSQL, SQLite diff --git a/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch new file mode 100644 index 00000000000..ede8a19d84d --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch @@ -0,0 +1,52 @@ +From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat, 26 Jan 2019 21:09:14 +0100 +Subject: [PATCH] Find mysql_install_db and add required option + +Rebase patch onto 19.03.80 +Gentoo-bug: 530012 +--- + src/server/storage/dbconfigmysql.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index dfff6fc29..80039c8ba 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin) + 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"), +@@ -588,7 +589,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) + }); + } +@@ -602,6 +603,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) + }); + } +@@ -622,7 +624,7 @@ 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) + }); + } +-- +2.20.1 + |