From 229100ecde79f6f3d031eb618acccb5aa6195b22 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 12 Jun 2022 04:23:28 -0500 Subject: user/[KDE Apps]: Update to 22.04.2 --- user/akonadi/APKBUILD | 13 +++++++------ user/akonadi/atomics.patch | 2 +- user/akonadi/lts.patch | 11 ----------- 3 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 user/akonadi/lts.patch (limited to 'user/akonadi') diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index ddf5ff3c3..61dd0437b 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=akonadi -pkgver=20.08.1 +pkgver=22.04.2 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -14,12 +14,12 @@ depends_dev="qt5-qtbase-dev boost-dev kconfig-dev kconfigwidgets-dev makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev libxslt-dev shared-mime-info sqlite-dev kcompletion-dev kcrash-dev kdesignerplugin-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev - kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev" + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev postgresql-dev xz-dev + doxygen postgresql" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc atomics.patch - lts.patch " build() { @@ -33,6 +33,8 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ + -DDATABASE_BACKEND=POSTGRES \ ${CMAKE_CROSSOPTS} . make } @@ -49,7 +51,6 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="e444f7449d4ac6ed184702d854785d3ce9a3c42878cb030934901a712a372cfc95c07d3e7b3ee70a1f0081a920f64d44372fbd194eb6c7c32b9938b69ab9ac5a akonadi-20.08.1.tar.xz +sha512sums="ea06a24ea0d740ba44705a33e7b7a51e99ca4a51efa735e409dd5be5707d0447ce409e8af88ad316a6064e61f381b27a63262a583d097a79cbdb132d6ca13d45 akonadi-22.04.2.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc -6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch -f9217e1632612206d0e86b4a3667544cf77218535109e2cdff4e9ddd84805bf8d04f38db3b84c909c405ac47c656e01fef170f1d48ebcd0c3e7bfadb3a0dd35c lts.patch" +3d895231b88aedf3ef45112d637d3b90696386ef8e00df61c5204cd054b01a7c4326748b5126f03abe4ff8ba7bd74e0686bee60060fefeb45aefa7744b2a046e atomics.patch" diff --git a/user/akonadi/atomics.patch b/user/akonadi/atomics.patch index 078501362..55bdb5c03 100644 --- a/user/akonadi/atomics.patch +++ b/user/akonadi/atomics.patch @@ -1,6 +1,6 @@ --- akonadi-20.04.2/src/server/CMakeLists.txt.old 2020-06-02 07:09:51.000000000 +0000 +++ akonadi-20.04.2/src/server/CMakeLists.txt 2020-06-16 00:56:48.253282683 +0000 -@@ -170,6 +170,7 @@ +@@ -272,6 +272,7 @@ set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver) target_link_libraries(libakonadiserver akonadi_shared diff --git a/user/akonadi/lts.patch b/user/akonadi/lts.patch deleted file mode 100644 index 8a6e4bcc9..000000000 --- a/user/akonadi/lts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- akonadi-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:15.000000000 +0000 -+++ akonadi-20.08.1/CMakeLists.txt 2020-09-17 06:42:47.218823728 +0000 -@@ -35,7 +35,7 @@ - - include(AkonadiMacros) - --set(QT_REQUIRED_VERSION "5.13.0") -+set(QT_REQUIRED_VERSION "5.12.9") - set(RELEASE_SERVICE_VERSION "20.08.1") - set(AKONADI_FULL_VERSION "${PIM_VERSION} (${RELEASE_SERVICE_VERSION})") - -- cgit v1.2.3-70-g09d2