diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-12-18 06:30:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-18 06:30:11 +0000 |
commit | f57e008aa126ccdca95f7424e4d24a1a83a49682 (patch) | |
tree | 485fb1d76c7c51ddd47615c50059dd46045ffbb5 /kde-apps/akonadi | |
parent | 066666b8767b78231b90d9b3ffc8169fbfe1ec7c (diff) |
gentoo auto-resync : 18:12:2024 - 06:30:11
Diffstat (limited to 'kde-apps/akonadi')
-rw-r--r-- | kde-apps/akonadi/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/akonadi/files/README.gentoo | 39 | ||||
-rw-r--r-- | kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch | 51 |
3 files changed, 0 insertions, 92 deletions
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index bbb8734babe4..acfc18a4a8b9 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,5 +1,3 @@ -AUX README.gentoo 1599 BLAKE2B aba3a897768323c2fa40a487fefd45529ce024a4ba11b1fd0dd9ff5fa6305d477820a6618609dd124a848593166bfeb52cc5e807dfa3c2125ac5116dd538de25 SHA512 d0dc40edf06f833bbebfbc96c4a1e27b0bc0a1108f059ffefc1e565b4497fabf3d997fdc7a769d918508fc92e1170d57470f676ead8fd874bf7c3911ea0d03af -AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219 DIST akonadi-24.08.3.tar.xz 1705408 BLAKE2B c209d3edda626f0768e05d5f63060068b06113cd2d31c53b9e335b4fb815d97280614d161ba4619795ab2c8604270dd613f036f9bdff1bcc3c86740194e48047 SHA512 efed4b344ab25ba986269b79b9157e3c5d1542fe93c4cd037a030b6740d564baf651de1e2db206cb996a46a6d007c787cdae8eef32df9ed70d1eee5d537b2167 DIST akonadi-24.12.0.tar.xz 1710188 BLAKE2B d4ed95eb1d0e70db3eec9566c885d935f45265e6348a102fc4c8f6121ee37f330fd4c5700b9b82f058cae86bce6444be3814ad937e53e3276b41f80d54bc2bff SHA512 c440a8def80f66332f383b84987ed972456ff8a5b8f86bbca13c2d213d610f831020d90041a994a7a39b40fd39ebcb4c414796d92a33e62072f9b1abaccdf384 EBUILD akonadi-24.08.3.ebuild 2417 BLAKE2B 310f6d68b615232e8b010dec320c39646ce049334e899f0d17b7a1360a63a9c1f9cc5e35ccdb25845ccf96d4feff984dac873ebd9ecc2295115f445f7e978639 SHA512 c8f37d677218bc36f870a23f1e00ebc6fca21d1a79cf2bb158bdc0efe5288dafeb7463b1a27318d20113973ea7f77726fc3c20ed0ae4f268fe838be4cfba47ea 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 - |