summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-12-17 08:26:30 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-12-17 22:49:46 +0100
commit940f202fe0a054d432c8b4029e515fbda748d98d (patch)
tree06cd5b3807af0425bf42c7565a5d276474303ece
parentkde-frameworks/qqc2-desktop-style: drop 6.8.0-r1 (diff)
downloadgentoo-940f202fe0a054d432c8b4029e515fbda748d98d.tar.gz
gentoo-940f202fe0a054d432c8b4029e515fbda748d98d.tar.bz2
gentoo-940f202fe0a054d432c8b4029e515fbda748d98d.zip
kde-apps/akonadi: remove unused patch/file
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/akonadi/files/README.gentoo39
-rw-r--r--kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch51
2 files changed, 0 insertions, 90 deletions
diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
deleted file mode 100644
index 69bb68c1f000..000000000000
--- a/kde-apps/akonadi/files/README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
-be in need of a manual fix. Failure to do so could result in akonadi service
-to stop fetching and sending mail for KMail or any other kind of issues in PIM
-applications depending on akonadi like KOrganizer, KAddressBook etc.
-
-Note:
- - All commands that follow are to be run by a regular user.
- - They will have to be repeated for any other user of KDE PIM.
- - Use your favorite terminal.
-
- 1) Check if "mysql" system db is present:
- $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
- from information_schema.schemata where schema_name = "mysql"'
-
- The output obtained should look like this:
- +-------------+
- | schema_name |
- +-------------+
- | mysql |
- +-------------+
-
- If so, then automatic DB upgrades will succeed, no further action necessary.
-
- 2) If, however, the above query returned empty, add the missing database:
- $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
-
- Future MariaDB releases should upgrade without manual intervention now.
-
- 3) Optional: You may have come here with an already defunct akonadi service.
- To manually fix the akonadi MariaDB backend:
- $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \
- -S /run/user/$(id -u)/akonadi/mysql.socket
-
- Don't forget to restart the akonadi service afterwards:
- $ akonadictl restart
-
-References:
- [1] https://bugs.gentoo.org/688746
- [2] https://bugs.kde.org/show_bug.cgi?id=409224
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
deleted file mode 100644
index 7cee0b0e815f..000000000000
--- a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-