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

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

commit:     5f2526ef8d14e0d5be9fd0fc5d1a68fa7d62aa36
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu May 26 14:16:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 26 14:49:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2526ef

kde-apps/akonadi: Fix mysql56-crash patch for master

CMake Warning--

Package-Manager: portage-2.2.28

 kde-apps/akonadi/akonadi-16.04.1.ebuild            |  1 -
 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild      |  1 -
 kde-apps/akonadi/akonadi-9999.ebuild               |  4 +--
 .../files/akonadi-16.07.80-mysql56-crash.patch     | 42 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild b/kde-apps/akonadi/akonadi-16.04.1.ebuild
index 54411a8..8327472 100644
--- a/kde-apps/akonadi/akonadi-16.04.1.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild
@@ -97,7 +97,6 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package xml LibXml2)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 6eec273..1333734 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -97,7 +97,6 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package xml LibXml2)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index b8e27db..849a687 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -26,7 +26,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -62,7 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -98,7 +97,6 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package xml LibXml2)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON

diff --git a/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
new file mode 100644
index 0000000..773b523
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
@@ -0,0 +1,42 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index db0c100..cdd8c6b 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -80,6 +80,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");
+@@ -500,7 +501,8 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+     return 0 == execute(mMysqlInstallDbPath,
+                         { QStringLiteral("--defaults-file=%1").arg(confFile),
+                           QStringLiteral("--force"),
+-                          QStringLiteral("--datadir=%1/").arg(dataDir) });
++                          QStringLiteral("--datadir=%1/").arg(dataDir),
++                          QStringLiteral("--basedir=/usr") });
+ }
+ 
+ /**
+@@ -512,7 +514,8 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+     return 0 == execute(mMysqldPath,
+                         { QStringLiteral("--defaults-file=%1").arg(confFile),
+                           QStringLiteral("--initialize"),
+-                          QStringLiteral("--datadir=%1/").arg(dataDir) });
++                          QStringLiteral("--datadir=%1/").arg(dataDir),
++                          QStringLiteral("--basedir=/usr") });
+ }
+ 
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
+@@ -520,5 +523,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("--datadir=%1/").arg(dataDir) });
++                           QStringLiteral("--datadir=%1/").arg(dataDir),
++                           QStringLiteral("--basedir=/usr") });
+ }