akonadi-git 20.08.1.r48.g5cc47ec9d-1

Update dependencies and git repo URL.

2 files changed, 16 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bde444a700b..5325f7ac6d88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = akonadi-git
 	pkgdesc = PIM layer, which provides an asynchronous API to access all kind of PIM data
-	pkgver = 19.04.2.r107.gf72c57701
+	pkgver = 20.08.1.r48.g5cc47ec9d
 	pkgrel = 1
 	url = https://kontact.kde.org
 	arch = x86_64
@@ -11,12 +11,9 @@ pkgbase = akonadi-git
 	makedepends = postgresql
 	makedepends = qt5-tools
 	makedepends = boost
-	makedepends = kdesignerplugin
-	makedepends = kio
 	makedepends = kitemmodels
-	source = git+https://anongit.kde.org/akonadi.git
-	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
-	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
+	makedepends = kaccounts-integration
+	source = git+https://invent.kde.org/pim/akonadi.git
 	sha512sums = SKIP
 
 pkgname = akonadi-git
@@ -25,14 +22,13 @@ pkgname = akonadi-git
 	optdepends = postgresql: PostgreSQL backend
 	optdepends = postgresql-old-upgrade: upgrade from previous major PostgreSQL version using pg_upgrade
 	optdepends = sqlite: SQLite backend
-	provides = akonadi=19.04.2.r107.gf72c57701
+	provides = akonadi=20.08.1.r48.g5cc47ec9d
 	conflicts = akonadi
 
 pkgname = libakonadi-git
 	pkgdesc = Libraries used by applications based on Akonadi
-	depends = kio
 	depends = kitemmodels
-	depends = hicolor-icon-theme
-	provides = libakonadi=19.04.2.r107.gf72c57701
+	depends = kaccounts-integration
+	provides = libakonadi=20.08.1.r48.g5cc47ec9d
 	conflicts = libakonadi
 
diff --git a/PKGBUILD b/PKGBUILD
index c22b478b3c32..51b5955cd0fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: nl6720 <nl6720@gmail.com>
+# Maintainer: nl6720 <nl6720@archlinux.org>
 # Contributor: Jack Random <jack (@) random.to>
 # Contributor: Jerome Leclanche <jerome.leclanche+arch@gmail.com>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
@@ -8,17 +8,15 @@
 
 pkgbase=akonadi-git
 pkgname=(akonadi-git libakonadi-git)
-pkgver=19.04.2.r107.gf72c57701
+pkgver=20.08.1.r48.g5cc47ec9d
 pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
+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=(git extra-cmake-modules mariadb postgresql qt5-tools boost kdesignerplugin kio kitemmodels)
-source=("git+https://anongit.kde.org/akonadi.git")
+makedepends=(git extra-cmake-modules mariadb postgresql qt5-tools boost kitemmodels kaccounts-integration)
+source=("git+https://invent.kde.org/pim/akonadi.git")
 sha512sums=('SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 pkgver() {
 	cd "${pkgname%-git}"
@@ -31,22 +29,20 @@ prepare() {
 }
 
 build() {
-	cd build
-	cmake ../"${pkgname%-git}" \
+	cmake -B build -S "${pkgname%-git}" \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_TESTING=OFF
-	make
+	cmake --build build
 }
 
 package_libakonadi-git() {
 	pkgdesc='Libraries used by applications based on Akonadi'
-	depends=(kio kitemmodels hicolor-icon-theme)
+	depends=(kitemmodels kaccounts-integration)
 	conflicts=("${pkgname%-git}")
 	provides=("${pkgname%-git}=${pkgver}")
 
-	cd build
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 	rm -r "$pkgdir"/usr/bin # Provided by akonadi
 }
 
@@ -59,7 +55,6 @@ package_akonadi-git() {
 	conflicts=("${pkgname%-git}")
 	provides=("${pkgname%-git}=${pkgver}")
 
-	cd build
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 	rm -r "$pkgdir"/{etc,usr/{include,lib,share}} # Provided by libakonadi
 }