From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5D7D138330 for ; Thu, 15 Sep 2016 12:44:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B026E0B16; Thu, 15 Sep 2016 12:44:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD436E0B16 for ; Thu, 15 Sep 2016 12:44:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51CAB340A23 for ; Thu, 15 Sep 2016 12:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2080D2479 for ; Thu, 15 Sep 2016 12:44:19 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1473943448.993776ca60a1b07b7b1cea69088fea91410b3872.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/akonadi/akonadi-9999.ebuild kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch X-VCS-Directories: kde-apps/akonadi/files/ kde-apps/akonadi/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 993776ca60a1b07b7b1cea69088fea91410b3872 X-VCS-Branch: master Date: Thu, 15 Sep 2016 12:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 56c94c08-828a-4e98-b34f-07d304615eb2 X-Archives-Hash: 7a2c0fd3daa8acedb8aa6afb6df00804 commit: 993776ca60a1b07b7b1cea69088fea91410b3872 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 15 12:44:04 2016 +0000 Commit: Michael Palimaka gentoo 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) }); + }