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

[Antonio Rojas]

    Date: Thursday, June 27, 2019 @ 15:15:29
  Author: arojas
Revision: 356972

archrelease: copy trunk to testing-x86_64

Added:
  akonadi/repos/testing-x86_64/PKGBUILD
    (from rev 356971, akonadi/trunk/PKGBUILD)
  akonadi/repos/testing-x86_64/kdebug-409234.patch
    (from rev 356971, akonadi/trunk/kdebug-409234.patch)
Deleted:
  akonadi/repos/testing-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |  105 ++++++++++++++++++++++++++------------------------
 kdebug-409234.patch |   13 ++++++
 2 files changed, 68 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-27 15:14:48 UTC (rev 356971)
+++ PKGBUILD	2019-06-27 15:15:29 UTC (rev 356972)
@@ -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=19.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 boost kdesignerplugin kio kitemmodels)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('16e1c6dd48004d9b1ad0c1dc38372ccdd5529c7e360fce95f65067b83407b6d2'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package_libakonadi() {
-  pkgdesc='Libraries used by applications based on Akonadi'
-  depends=(kio kitemmodels hicolor-icon-theme)
-
-  cd build
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/bin # Provided by akonadi
-}
-
-package_akonadi() {
-  depends=(libakonadi mariadb)
-  optdepends=('postgresql: PostgreSQL backend')
-
-  cd build
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/{etc,usr/{include,lib,share}} # Provided by libakonadi
-}

Copied: akonadi/repos/testing-x86_64/PKGBUILD (from rev 356971, akonadi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-27 15:15:29 UTC (rev 356972)
@@ -0,0 +1,55 @@
+# 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=19.04.2
+pkgrel=4
+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 boost kdesignerplugin kio kitemmodels)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        kdebug-409234.patch)
+sha256sums=('16e1c6dd48004d9b1ad0c1dc38372ccdd5529c7e360fce95f65067b83407b6d2'
+            'SKIP'
+            'c38706472c5a5adf74d5a86908554ecbfe332f9a6a03729c6557ac9651b68dad')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-409234.patch # Fix postgresql backend with Qt 5.13
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package_libakonadi() {
+  pkgdesc='Libraries used by applications based on Akonadi'
+  depends=(kio kitemmodels hicolor-icon-theme)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/bin # Provided by akonadi
+}
+
+package_akonadi() {
+  depends=(libakonadi mariadb)
+  optdepends=('postgresql: PostgreSQL backend')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/{etc,usr/{include,lib,share}} # Provided by libakonadi
+}

Copied: akonadi/repos/testing-x86_64/kdebug-409234.patch (from rev 356971, akonadi/trunk/kdebug-409234.patch)
===================================================================
--- kdebug-409234.patch	                        (rev 0)
+++ kdebug-409234.patch	2019-06-27 15:15:29 UTC (rev 356972)
@@ -0,0 +1,13 @@
+diff --git a/src/server/storage/dbintrospector.cpp b/src/server/storage/dbintrospector.cpp
+index 224faf7f8..70d952a6f 100644
+--- a/src/server/storage/dbintrospector.cpp
++++ b/src/server/storage/dbintrospector.cpp
+@@ -76,7 +76,7 @@ bool DbIntrospector::hasColumn(const QString &tableName, const QString &columnNa
+     QStringList columns = m_columnCache.value(tableName);
+ 
+     if (columns.isEmpty()) {
+-        const QSqlRecord table = m_database.record(tableName);
++        const QSqlRecord table = m_database.record(tableName.toLower());
+         const int numTables = table.count();
+         columns.reserve(numTables);
+         for (int i = 0; i < numTables; ++i) {