summaryrefslogtreecommitdiff
path: root/user/libkleo
diff options
context:
space:
mode:
Diffstat (limited to 'user/libkleo')
-rw-r--r--user/libkleo/APKBUILD17
-rw-r--r--user/libkleo/egregious-versions.patch32
2 files changed, 6 insertions, 43 deletions
diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index e181b6e6a..06ddb780b 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.0
+pkgver=22.04.2
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,17 @@ 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
+ # These excluded tests require a running X11 session.
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(editdirectoryservicedialog|keyselectioncombo|keyserverconfig|newkeyapprovaldialog)'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="02bc542ff7f9ecf5741039def5d884d52c4009f98ca9fc27d58b794d2028443a511a71f6080d3e958b4ca72bdb5c10b5537253204118139469f0199f865f1ccf libkleo-19.08.0.tar.xz
-57c2c0a2588bd40ccb1c0e197d41087e347126f56761e426198b9e38eab9bd8bc8a1c2344db36fabbc3f714c90912ec3d837fccbe36ac284b4f07d4a41c2dae3 egregious-versions.patch"
+sha512sums="775307703ff913d8dcb2ee34c4b3526c60e85320c4f377e968562d6dc3e2dd3110b5c9477b7a186837abb024db5c488ee42ec86b7e7347d5a2ba5dd031f34968 libkleo-22.04.2.tar.xz"
diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch
deleted file mode 100644
index db713dc6c..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})
-@@ -24,7 +24,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.0")
-
- 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
-@@ -90,6 +90,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)