From 229100ecde79f6f3d031eb618acccb5aa6195b22 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 12 Jun 2022 04:23:28 -0500
Subject: user/[KDE Apps]: Update to 22.04.2

---
 user/akonadi-contacts/APKBUILD                  | 15 ++++++---------
 user/akonadi-contacts/build-without-trunk.patch | 17 -----------------
 user/akonadi-contacts/lts.patch                 | 11 -----------
 3 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 user/akonadi-contacts/build-without-trunk.patch
 delete mode 100644 user/akonadi-contacts/lts.patch

(limited to 'user/akonadi-contacts')

diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD
index 2e2da81ff..fdb83ce88 100644
--- a/user/akonadi-contacts/APKBUILD
+++ b/user/akonadi-contacts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=akonadi-contacts
-pkgver=20.08.1
+pkgver=22.04.2
 pkgrel=0
 pkgdesc="Library for integrating contact lists with Akonadi"
 url="https://www.kde.org/"
@@ -9,14 +9,12 @@ arch="all"
 options="!check"  # Tests require X11
 license="LGPL-2.1+"
 depends=""
-depends_dev="qt5-qtbase-dev akonadi-dev kcontacts-dev kcoreaddons-dev
-	kservice-dev"
+depends_dev="qt5-qtbase-dev akonadi-dev grantleetheme-dev kcontacts-dev
+	kcoreaddons-dev kservice-dev"
 makedepends="$depends_dev cmake extra-cmake-modules akonadi-mime-dev kio-dev
-	kmime-dev prison-dev"
+	grantlee-dev kcmutils-dev kmime-dev prison-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz
-	lts.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,5 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5d7a481b60cc7d6068e4bd12fd22e695f43652e3ebe4e03e5512c5901240193408a2e72227de91f00c76833b957d7c9b26c62a4fe16615028229b46d40360b4b  akonadi-contacts-20.08.1.tar.xz
-06ba7fb686e41eda820f98045832b80fd894e81c0b4a3edb50fbfbeb2d14a2e27e7536ca6729ad445326cd253c14ffa06653d73f7eaefa61ce9346b642792b73  lts.patch"
+sha512sums="81899905896da0f3b3459201400e6461d3dbec5ea2752b5176b0870974e015d03a5e409b5958c57fa737ac6b9381e9f5b347ba673d4346c32b7f84677478695c  akonadi-contacts-22.04.2.tar.xz"
diff --git a/user/akonadi-contacts/build-without-trunk.patch b/user/akonadi-contacts/build-without-trunk.patch
deleted file mode 100644
index 9354bba96..000000000
--- a/user/akonadi-contacts/build-without-trunk.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- akonadi-contacts-17.08.1-55/CMakeLists.txt.old	2017-10-11 17:15:27.000000000 -0500
-+++ akonadi-contacts-17.08.1-55/CMakeLists.txt	2017-10-11 17:31:53.667300461 -0500
-@@ -25,10 +25,10 @@
- 
- 
- set(AKONADI_CONTACTS_VERSION ${PIM_VERSION})
--set(AKONADI_MIME_VERSION "5.6.40")
--set(KCONTACTS_VERSION "5.6.40")
--set(KMIMELIB_VERSION "5.6.40")
--set(AKONADI_VERSION "5.6.40")
-+set(AKONADI_MIME_VERSION "5.6.1")
-+set(KCONTACTS_VERSION "5.6.1")
-+set(KMIMELIB_VERSION "5.6.1")
-+set(AKONADI_VERSION "5.6.1")
- 
- set(QT_REQUIRED_VERSION "5.8.0")
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
diff --git a/user/akonadi-contacts/lts.patch b/user/akonadi-contacts/lts.patch
deleted file mode 100644
index 946f29590..000000000
--- a/user/akonadi-contacts/lts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- akonadi-contacts-20.08.1/CMakeLists.txt.old	2020-09-01 06:34:26.000000000 +0000
-+++ akonadi-contacts-20.08.1/CMakeLists.txt	2020-09-17 16:27:53.030804534 +0000
-@@ -30,7 +30,7 @@
- set(KMIMELIB_VERSION "5.15.1")
- set(AKONADI_VERSION "5.15.1")
- 
--set(QT_REQUIRED_VERSION "5.13.0")
-+set(QT_REQUIRED_VERSION "5.12.9")
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
- ########### Find packages ###########
- find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
-- 
cgit v1.2.3-70-g09d2