From ef6f71e3770071a29e967ece65fc7a46b88a83ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 12 May 2024 08:50:28 +0700 Subject: [PATCH] akonadi5: conflicts with kf6-akonadi instead --- srcpkgs/akonadi5/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index 1abbf172774..bec826e8a2d 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -1,7 +1,7 @@ # Template file for 'akonadi5' pkgname=akonadi5 version=23.08.5 -revision=2 +revision=3 build_style=cmake build_helper="qemu" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -18,6 +18,7 @@ license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz" checksum=abdbdb28c1084a6ad119d7292175ad31efb4a7898a32cc32a35aa1485d9c4f38 +conflicts="kf6-akonadi>=0" pre_configure() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then @@ -33,8 +34,11 @@ do_check() { } post_install() { + # TODO once everything moved to kf6-akonadi, drop them + # It's needed to kmymoney, for now, conflicts with kf6-akonadi + # kmail built with akonadi5 doesn't work with kf6-akonadi # fix conflict with akonadi - rm -r "${DESTDIR}"/{etc,usr/{bin,share}} + : rm -r "${DESTDIR}"/{etc,usr/{bin,share}} } akonadi5-devel_package() {