From e037e1bba1640cf1797ee326028a7ed30ad2a5ed Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:13:35 +0100
Subject: [PATCH] apply merge request to fix breaking database on upgrade, see
 https://invent.kde.org/pim/akonadi/-/merge_requests/105 [release
 22.04.2-2mamba;Sat Jun 18 2022]

---
 ...-22.04.2-revert-deleting-ib_logfile0.patch | 34 +++++++++++++++++++
 akonadi.spec                                  |  7 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 akonadi-22.04.2-revert-deleting-ib_logfile0.patch

diff --git a/akonadi-22.04.2-revert-deleting-ib_logfile0.patch b/akonadi-22.04.2-revert-deleting-ib_logfile0.patch
new file mode 100644
index 0000000..11271ef
--- /dev/null
+++ b/akonadi-22.04.2-revert-deleting-ib_logfile0.patch
@@ -0,0 +1,34 @@
+From 6567fbcae7cbb3331ed93575b7b331d8f2fde23d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 17 Jun 2022 18:28:58 +0200
+Subject: [PATCH] Don't delete mariadb log files
+
+The ib_logfile0 file is mandatory in MariaDB 10.8 [1] so akonadi deleting it on upgrade breaks the database self-check and prevents akonadi from working
+
+[1] https://jira.mariadb.org/browse/MDEV-14425
+
+BUG: 454948
+---
+ src/server/storage/dbconfigmysql.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index 8c5a52628..35fffd865 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -390,12 +390,6 @@ bool DbConfigMysql::startInternalServer()
+             }
+         }
+ 
+-        // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate
+-        if (confUpdate) {
+-            QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile0")).remove();
+-            QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile1")).remove();
+-        }
+-
+         qCDebug(AKONADISERVER_LOG) << "Executing:" << mMysqldPath << arguments.join(QLatin1Char(' '));
+         mDatabaseProcess = new QProcess;
+         mDatabaseProcess->start(mMysqldPath, arguments);
+-- 
+GitLab
+
diff --git a/akonadi.spec b/akonadi.spec
index 62e9ce9..9fe65c9 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,7 +1,7 @@
 %define gccver %(gcc -dumpversion)
 Name:          akonadi
 Version:       22.04.2
-Release:       1mamba
+Release:       2mamba
 Summary:       PIM Storage Service
 Group:         System/Libraries
 Vendor:        openmamba
@@ -10,6 +10,7 @@ Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://userbase.kde.org/Akonadi
 Source:        http://download.kde.org/stable/release-service/%{version}/src/akonadi-%{version}.tar.xz
 Patch0:        akonadi-16.04.2-qt-5.7.0-sqlite3.patch
+Patch1:        akonadi-22.04.2-revert-deleting-ib_logfile0.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -83,6 +84,7 @@ This package contains static libraries and header files need for development.
 #-D -T
 #:<< _EOF
 #%patch0 -p1
+%patch1 -p1 -b .revert-deleting-ib_logfile0
 
 %build
 #:<< _EOF
@@ -176,6 +178,9 @@ update-mime-database -n %{_datadir}/mime &> /dev/null
 %doc NEWS README.md
 
 %changelog
+* Sat Jun 18 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 22.04.2-2mamba
+- apply merge request to fix breaking database on upgrade, see https://invent.kde.org/pim/akonadi/-/merge_requests/105
+
 * Thu Jun 09 2022 Automatic Build System <autodist@mambasoft.it> 22.04.2-1mamba
 - automatic version update by autodist