[arch-commits] Commit in akonadi/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Thursday, July 7, 2022 @ 09:41:52
  Author: arojas
Revision: 449993

archrelease: copy trunk to extra-x86_64

Added:
  akonadi/repos/extra-x86_64/PKGBUILD
    (from rev 449992, akonadi/trunk/PKGBUILD)
Deleted:
  akonadi/repos/extra-x86_64/PKGBUILD
  akonadi/repos/extra-x86_64/mariadb-10.8.patch

--------------------+
 PKGBUILD           |   94 +++++++++++++++++++++++----------------------------
 mariadb-10.8.patch |   17 ---------
 2 files changed, 44 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-07 09:41:42 UTC (rev 449992)
+++ PKGBUILD	2022-07-07 09:41:52 UTC (rev 449993)
@@ -1,50 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=akonadi
-pkgname=(akonadi libakonadi)
-pkgver=22.04.2
-pkgrel=3
-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}
-        mariadb-10.8.patch)
-sha256sums=('a38100943cef2cd69bb509e28b96a614bbc3d2f4394a5f4d01916db77544cd64'
-            'SKIP'
-            'cf06633f3df7314d8c81602ac7f28b1e9544015fb72334e57305136103bd18c4')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
-              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-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 \
-    -DBUILD_QCH=ON
-  cmake --build build
-}
-
-package_libakonadi() {
-  pkgdesc='Libraries used by applications based on Akonadi'
-  depends=(kitemmodels kaccounts-integration)
-
-  DESTDIR="$pkgdir" cmake --install build
-  rm -r "$pkgdir"/usr/bin # Provided by akonadi
-}
-
-package_akonadi() {
-  depends=(libakonadi mariadb)
-  optdepends=('postgresql: PostgreSQL backend')
-
-  DESTDIR="$pkgdir" cmake --install build
-  rm -r "$pkgdir"/{etc,usr/{include,lib,share}} # Provided by libakonadi
-}

Copied: akonadi/repos/extra-x86_64/PKGBUILD (from rev 449992, akonadi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-07 09:41:52 UTC (rev 449993)
@@ -0,0 +1,44 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=akonadi
+pkgname=(akonadi libakonadi)
+pkgver=22.04.3
+pkgrel=1
+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})
+sha256sums=('7e0221807ed291562ec38262907ecc338b19acfcbba9093db9007825a83c473c'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
+              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+options=(debug)
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  cmake --build build
+}
+
+package_libakonadi() {
+  pkgdesc='Libraries used by applications based on Akonadi'
+  depends=(kitemmodels kaccounts-integration)
+
+  DESTDIR="$pkgdir" cmake --install build
+  rm -r "$pkgdir"/usr/bin # Provided by akonadi
+}
+
+package_akonadi() {
+  depends=(libakonadi mariadb)
+  optdepends=('postgresql: PostgreSQL backend')
+
+  DESTDIR="$pkgdir" cmake --install build
+  rm -r "$pkgdir"/{etc,usr/{include,lib,share}} # Provided by libakonadi
+}

Deleted: mariadb-10.8.patch
===================================================================
--- mariadb-10.8.patch	2022-07-07 09:41:42 UTC (rev 449992)
+++ mariadb-10.8.patch	2022-07-07 09:41:52 UTC (rev 449993)
@@ -1,17 +0,0 @@
-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);