commit: 2afeb25b979328971b69742c9986ad5b029d6fc4 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Fri Oct 2 19:13:28 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Oct 2 19:13:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2afeb25b
kde-apps/akonadi: add patch from app-office/akonadi-server:4 Package-Manager: portage-2.2.20.1 kde-apps/akonadi/akonadi-15.08.1.ebuild | 2 ++ kde-apps/akonadi/akonadi-15.08.49.9999.ebuild | 2 ++ kde-apps/akonadi/akonadi-9999.ebuild | 2 ++ .../files/akonadi-15.08-mysql56-crash.patch | 23 ++++++++++++++++++++++ .../files/akonadi-15.12-mysql56-crash.patch | 23 ++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/kde-apps/akonadi/akonadi-15.08.1.ebuild b/kde-apps/akonadi/akonadi-15.08.1.ebuild index 8d7f7a9..44204d1 100644 --- a/kde-apps/akonadi/akonadi-15.08.1.ebuild +++ b/kde-apps/akonadi/akonadi-15.08.1.ebuild @@ -36,6 +36,8 @@ RDEPEND="${CDEPEND} !app-office/akonadi-server " +PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" ) + pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL # reverse driver check to keep the order diff --git a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild index 718b4f0..f5a3052 100644 --- a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild +++ b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild @@ -36,6 +36,8 @@ RDEPEND="${CDEPEND} !app-office/akonadi-server " +PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" ) + pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL # reverse driver check to keep the order diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index 718b4f0..2af4002 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -36,6 +36,8 @@ RDEPEND="${CDEPEND} !app-office/akonadi-server " +PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" ) + pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL # reverse driver check to keep the order diff --git a/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch new file mode 100644 index 0000000..933b60b --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch @@ -0,0 +1,23 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index a18144d..68b0ecd 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -77,6 +77,7 @@ bool DbConfigMysql::init(QSettings &settings) + << QLatin1String("/usr/sbin") + << QLatin1String("/usr/local/sbin") + << QLatin1String("/usr/local/libexec") ++ << QLatin1String("/usr/share/mysql/scripts") + << QLatin1String("/usr/libexec") + << QLatin1String("/opt/mysql/libexec") + << QLatin1String("/opt/local/lib/mysql5/bin") +@@ -280,7 +281,7 @@ void DbConfigMysql::startInternalServer() + // first run, some MySQL versions need a mysql_install_db run for that + const QString confFile = XdgBaseDirs::findResourceFile("config", QLatin1String("akonadi/mysql-global.conf")); + if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) { +- const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir); ++ const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ; + QProcess::execute(mMysqlInstallDbPath, arguments); + } + diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch new file mode 100644 index 0000000..d67c964 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch @@ -0,0 +1,23 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 517f4bc..a7a3f38 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -78,6 +78,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"); +@@ -287,7 +288,7 @@ bool DbConfigMysql::startInternalServer() + // first run, some MySQL versions need a mysql_install_db run for that + const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); + if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) { +- const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir); ++ const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ; + QProcess::execute(mMysqlInstallDbPath, arguments); + } +