Date: Wednesday, June 15, 2022 @ 18:48:29 Author: arojas Revision: 448726
Fix crash when upgrading mariadb to 10.8 Added: akonadi/trunk/mariadb-10.8.patch Modified: akonadi/trunk/PKGBUILD --------------------+ PKGBUILD | 12 +++++++++--- mariadb-10.8.patch | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-15 13:29:08 UTC (rev 448725) +++ PKGBUILD 2022-06-15 18:48:29 UTC (rev 448726) @@ -6,20 +6,26 @@ pkgbase=akonadi pkgname=(akonadi libakonadi) pkgver=22.04.2 -pkgrel=1 +pkgrel=2 pkgdesc='PIM layer, which provides an asynchronous API to access all kind of PIM data' arch=(x86_64) url='https://kontact.kde.org' license=(LGPL) makedepends=(extra-cmake-modules postgresql qt5-tools kitemmodels kaccounts-integration doxygen) -source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) +source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} + mariadb-10.8.patch) sha256sums=('a38100943cef2cd69bb509e28b96a614bbc3d2f4394a5f4d01916db77544cd64' - 'SKIP') + 'SKIP' + 'cf06633f3df7314d8c81602ac7f28b1e9544015fb72334e57305136103bd18c4') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <[email protected]> D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]> options=(debug) +prepare() { + patch -d $pkgname-$pkgver -p1 < mariadb-10.8.patch # Don't delete log file which is mandatory in mariadb 10.8 +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF \ Added: mariadb-10.8.patch =================================================================== --- mariadb-10.8.patch (rev 0) +++ mariadb-10.8.patch 2022-06-15 18:48:29 UTC (rev 448726) @@ -0,0 +1,17 @@ +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);
