commit: a8464c31b62cdd678b50ac0a81c0c6773f53a355 Author: Elias Probst <mail <AT> eliasprobst <DOT> eu> AuthorDate: Sat Jan 7 21:34:30 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun Jan 8 11:15:56 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8464c31
kde-apps/akonadi: Update MySQL 5.6 crash patch Upstream changed the code style in master/ddf0db43 Package-Manager: Portage-2.3.0, Repoman-2.3.1 Closes: https://github.com/gentoo/kde/pull/853 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> kde-apps/akonadi/akonadi-9999.ebuild | 2 +- .../files/akonadi-17.03.80-mysql56-crash.patch | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index 8ae3948..91792b8 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND} # some akonadi tests time out, that probably needs more work as it's ~700 tests RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" ) +PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch new file mode 100644 index 0000000..0b5e381 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch @@ -0,0 +1,40 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 50421714d..dfae09c20 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"); +@@ -511,7 +512,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) + }); + } +@@ -539,7 +541,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) + }); + }
