[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     993776ca60a1b07b7b1cea69088fea91410b3872
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 12:44:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 12:44:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=993776ca

kde-apps/akonadi: rebase patch

Upstream added basedir detection, but it still will not work for Gentoo because
mysql_install_db lives in /usr/share/mysql/scripts.

Upstream-commit: 37c639a158f78b810e84c84a9c42b6b63571c447

Package-Manager: portage-2.3.0

 kde-apps/akonadi/akonadi-9999.ebuild               |  2 +-
 .../files/akonadi-16.12.0-mysql56-crash.patch      | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 9e1e6bb..c8e64f2 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -59,7 +59,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.07.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

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 0000000..8f33abb
--- /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) });
+ }