From 289b796f4fb220f55d4f9b067c6f40b9f941d201 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 2 Jan 2020 19:54:20 +0000
Subject: user/[KDE Utilities]: Bump to 19.12.0

---
 user/libkleo/APKBUILD                 | 14 ++++----------
 user/libkleo/egregious-versions.patch | 32 --------------------------------
 2 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 user/libkleo/egregious-versions.patch

(limited to 'user/libkleo')

diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index 51b9470f8..c68c75bef 100644
--- a/user/libkleo/APKBUILD
+++ b/user/libkleo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkleo
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="KDE encryption library"
 url="https://www.kde.org/"
@@ -13,12 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg
 makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev
 	kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz
-	egregious-versions.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -29,19 +26,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2b68d7d6b154bb16638bb5b533f1239cbbcd610eca14b8e346f14d75c3277f5566e4773797612966abd6dc94fd4f20918c581fded790431e572ba51e59ea1e5e  libkleo-19.08.2.tar.xz
-5a10a4de59fc4e89295488c88f6f21f88f58f47679c666e0909bbd7bb6b3b867091292d807c2786da4864043d22c84e4f7cd7757fc47c9e046bedb8289c3c7b6  egregious-versions.patch"
+sha512sums="35df26dccf805b5fc28956e25a9251f7b17e1c62a981ef474c8b34ff45176768c3317f227cb2280d5dc1187d188777e04f85721e7188a3627f4d0970a4b36ba8  libkleo-19.12.0.tar.xz"
diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch
deleted file mode 100644
index 27822b608..000000000
--- a/user/libkleo/egregious-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libKleo uses no new APIs.
-
---- libkleo-19.04.0/CMakeLists.txt.old	2019-04-12 00:16:32.000000000 +0000
-+++ libkleo-19.04.0/CMakeLists.txt	2019-04-19 06:31:09.576149789 +0000
-@@ -3,7 +3,7 @@
- 
- project(libkleo VERSION ${PIM_VERSION})
- 
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
- 
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-@@ -26,7 +26,7 @@
- 
- 
- set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- set(KDEPIMTEXTEDIT_VERSION "5.12.1")
- 
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
---- libkleo-19.08.0/CMakeLists.txt.old	2019-08-15 15:03:03.464693272 +0000
-+++ libkleo-19.08.0/CMakeLists.txt	2019-08-15 15:05:18.800204812 +0000
-@@ -92,6 +92,6 @@
- 
- 
- add_subdirectory(src)
--install(FILES libkleo.renamecategories libkleo.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+#install(FILES libkleo.renamecategories libkleo.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- ki18n_install(po)
-- 
cgit v1.2.3-70-g09d2