From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
Date: Mon, 15 Feb 2021 14:39:01 +0000 (UTC) [thread overview]
Message-ID: <1613398375.3225f48c9c6e133d09233cd9a673a0146b18cef3.asturm@gentoo> (raw)
commit: 3225f48c9c6e133d09233cd9a673a0146b18cef3
Author: Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
AuthorDate: Wed Feb 10 10:43:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:12:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3225f48c
kde-apps/akonadi: Rebase mysql crash patch for live version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Manuel Nickschas <sputnick <AT> quassel-irc.org>
Closes: https://github.com/gentoo/kde/pull/896
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-9999.ebuild | 2 +-
.../files/akonadi-21.03.80-mysql56-crash.patch | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index e7d3dad598..3320293e8a 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MariaDB, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
new file mode 100644
index 0000000000..7cee0b0e81
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
@@ -0,0 +1,51 @@
+From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Wed, 10 Feb 2021 09:40:44 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 21.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index fd057670e..c19cff0e0 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -53,6 +53,7 @@ static QString findExecutable(const QString &bin)
+ 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"),
+@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+ == execute(mMysqlInstallDbPath,
+ {QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+- QStringLiteral("--basedir=%1").arg(baseDir),
++ QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+@@ -609,7 +610,7 @@ 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("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
+@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+ return 0
+ == execute(
+ mMysqlInstallDbPath,
+- {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=%1").arg(baseDir), QStringLiteral("--datadir=%1/").arg(dataDir)});
++ {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+--
+2.30.0
+
next reply other threads:[~2021-02-15 14:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 14:39 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-09 23:04 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ Andreas Sturmlechner
2019-11-17 21:54 Andreas Sturmlechner
2019-01-29 22:03 Andreas Sturmlechner
2017-01-08 10:59 Andreas Sturmlechner
2016-09-15 12:44 Michael Palimaka
2016-05-26 15:08 Michael Palimaka
2016-01-22 10:04 Michael Palimaka
2015-10-02 19:13 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1613398375.3225f48c9c6e133d09233cd9a673a0146b18cef3.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox