From nobody Sun Sep 10 08:45:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rk3MV3l5qz4srxC; Sun, 10 Sep 2023 08:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk3MV3Z1bz4R5V; Sun, 10 Sep 2023 08:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694335526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpmhoG0VGZlQmDdUwd58vXdPr4f8Ueg42RmMYZ61NoI=; b=DPCHO7/4kBRHwMkvsqOVtcRtH7tVumlBIpD2OAHOHXEP+21Ln5aGeNM0F64wsBeEqeu+BF U50F3L07YXkScjTuCpIjnHdLAl5OKLOXBcyPxf225h5HlwiJo8Rqh4Bf8OM2vpgYRDJch9 UACmqbzfxt1Ph6YjaaVm9RZR2k/1X+5bqEBVSYcsISmazQbEw5uAWV3e19fNV3KcAucUOv lf94DKZGsSQlkm6UFsKA7yzJSiNYjLEPQzcUTIEe3joRG8lTQODfatKysa4pDyek8dCK9h 7qI3oSwqUAVjiz7XjXxkd+jkAPTzYxqzjdzrsYXYINBNHkNH8ufhCezHPybYng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694335526; a=rsa-sha256; cv=none; b=OhxeR27/JrQ2Ex5h0u6ScsoS+f0zeft6DmCsW9sxz3YnB+XaWpkc/OzhbLjUqq/xkZjvqx Adi7rOBXHr+oHzu60KK+0O281wYG0yvJ3Iy5zsOmV+Yc9R7JPJdIh2c/CxrsVIrmK9QIQh EHElWlRW3oiZ2/3reGeVwScT35NunZpPqFuC36cTKB4U4DJqXCgmgBn6K8fcdUG8L6rUbn kzA3avQUBaMF9Sd51cXwzccMf/rgiTzGy65AspkqVpnyH22Y9qepAfFx+dqWabgcwwJSyZ 517Rpy1CvNdmmFBHDITxwwlUeCGB3uY7dD6z5bnLYX0LsyNGWwXRb6gphaAikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694335526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpmhoG0VGZlQmDdUwd58vXdPr4f8Ueg42RmMYZ61NoI=; b=MtBD3410BSYYp/OXXvvXFCuPLC0l0MvPOwHkabz7IM0OyLGQRtqd65rvRxR60XuYbIuFEp rCvLxuqHuLCzsl3VNsY+g7mXRe2+uO4YXRRrmwQ3eECO5kJIpE6hOmSmpgmrp5EVWLWTqf 0BOdO5CMIZpxlamzT8p8vksYP9OxOokhxa1r6CM20p1J9oUeFf8Ujdvl5t1b5FZP9O/wNB 3871eKI/HET9T+Flih/A7u/VH2w0LmA88mWmXhGH/ilxCcH64U2LRFeBYfKyhddj4YweeV Jv5DyHnaN1+B068bA2Pvqu5scJHnBG7BG6VIa/DW5U8pTqGsdNXXfpoIC8Q0Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rk3MV2WKMz10Xw; Sun, 10 Sep 2023 08:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A8jQQF075622; Sun, 10 Sep 2023 08:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A8jQF7075619; Sun, 10 Sep 2023 08:45:26 GMT (envelope-from git) Date: Sun, 10 Sep 2023 08:45:26 GMT Message-Id: <202309100845.38A8jQF7075619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 3edfc59720f6 - main - finance/kraft: import upstream patches to deal with Akonadi renames List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3edfc59720f656a84cda06ed267fbe7f19a78210 Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=3edfc59720f656a84cda06ed267fbe7f19a78210 commit 3edfc59720f656a84cda06ed267fbe7f19a78210 Author: Adriaan de Groot AuthorDate: 2023-09-10 08:44:36 +0000 Commit: Adriaan de Groot CommitDate: 2023-09-10 08:45:22 +0000 finance/kraft: import upstream patches to deal with Akonadi renames --- finance/kraft/Makefile | 2 +- ...-0001-Adopt-CMake-files-to-Akonadi-prefix-KPim5 | 119 +++++++++++++++++ ...ption-to-set-AKO_PREFIX-rather-than-an-internal | 25 ++++ .../files/patch-0003-Fix-Akonadi-legacy-detection | 47 +++++++ ...-Akonadi-version-check-for-some-renamed-compone | 147 +++++++++++++++++++++ 5 files changed, 339 insertions(+), 1 deletion(-) diff --git a/finance/kraft/Makefile b/finance/kraft/Makefile index a0b7c789b0b2..4f6e5fee4193 100644 --- a/finance/kraft/Makefile +++ b/finance/kraft/Makefile @@ -1,7 +1,7 @@ PORTNAME= kraft DISTVERSIONPREFIX= v DISTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance kde MAINTAINER= kde@FreeBSD.org diff --git a/finance/kraft/files/patch-0001-Adopt-CMake-files-to-Akonadi-prefix-KPim5 b/finance/kraft/files/patch-0001-Adopt-CMake-files-to-Akonadi-prefix-KPim5 new file mode 100644 index 000000000000..8e5b8b0640b6 --- /dev/null +++ b/finance/kraft/files/patch-0001-Adopt-CMake-files-to-Akonadi-prefix-KPim5 @@ -0,0 +1,119 @@ +From f54b317f5cd894e4063b6d4c4c3a96012c1bcb28 Mon Sep 17 00:00:00 2001 +From: Klaas Freitag +Date: Sat, 29 Apr 2023 10:37:55 +0200 +Subject: [PATCH] Adopt CMake files to Akonadi prefix KPim5 + +--- + CMakeLists.txt | 16 ++++++++++------ + src/CMakeLists.txt | 13 ++++++------- + tools/CMakeLists.txt | 6 +++--- + 3 files changed, 19 insertions(+), 16 deletions(-) + +diff --git CMakeLists.txt CMakeLists.txt +index 07e15dd..8b5374c 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -8,6 +8,9 @@ find_package(ECM REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + set(CMAKE_AUTOMOC TRUE) + ++# Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23 ++set(AKO_PREFIX "KPim5") ++ + include(KDEInstallDirs) + include(KDECMakeSettings) + include(ECMInstallIcons) +@@ -47,23 +50,23 @@ set_package_properties(Grantlee5 PROPERTIES + TYPE OPTIONAL + ) + +-find_package(KF5Akonadi) +-set_package_properties(KF5Akonadi PROPERTIES ++find_package(${AKO_PREFIX}Akonadi) ++set_package_properties(${AKO_PREFIX}Akonadi PROPERTIES + DESCRIPTION "Library for general Access to Akonadi" + URL "https://www.kde.org/" + PURPOSE "Optionally used for addressbook integration" + TYPE OPTIONAL + ) + +-find_package(KF5AkonadiContact) +-set_package_properties(KF5AkonadiContact PROPERTIES ++find_package(${AKO_PREFIX}AkonadiContact) ++set_package_properties(${AKO_PREFIX}AkonadiContact PROPERTIES + DESCRIPTION "Library for Accessing Contacts stored in Akonadi" + URL "https://www.kde.org/" + PURPOSE "Optionally used for addressbook integration" + TYPE OPTIONAL + ) + +-if(KF5Akonadi_FOUND AND KF5AkonadiContact_FOUND) ++if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND) + add_definitions(-DHAVE_AKONADI) + endif() + +@@ -80,7 +83,8 @@ set(QT_DEFINITIONS "${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DE + add_definitions(${QT_DEFINITIONS} ) + + include_directories(${QT_INCLUDES} src) +-include_directories( /usr/include/KF5/AkonadiCore ) ++include_directories( /usr/include/${AKO_PREFIX}/AkonadiCore ) ++include_directories(/usr/include/${AKO_PREFIX}/) + + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ki18n_install(po) +diff --git src/CMakeLists.txt src/CMakeLists.txt +index 6eaa557..8e9b069 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -1,4 +1,3 @@ +-# include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${KDEPIMLIBS_INCLUDE_DIRS} external) + + include_directories(${QT_INCLUDES} src) + add_subdirectory(pics) +@@ -167,13 +166,13 @@ set(KRAFT_LINK_LIBS + ${CTEMPLATE_LIBRARIES} pthread + Grantlee5::Templates + ) +-if(KF5Akonadi_FOUND) ++if(${AKO_PREFIX}Akonadi_FOUND) + list(APPEND KRAFT_LINK_LIBS +- KF5::AkonadiCore +- KF5::AkonadiContact +- KF5::AkonadiAgentBase +- KF5::AkonadiWidgets +- KF5::AkonadiXml ++ ${AKO_PREFIX}::AkonadiCore ++ ${AKO_PREFIX}::AkonadiContact ++ ${AKO_PREFIX}::AkonadiAgentBase ++ ${AKO_PREFIX}::AkonadiWidgets ++ ${AKO_PREFIX}::AkonadiXml + ) + endif() + +diff --git tools/CMakeLists.txt tools/CMakeLists.txt +index 0c58c75..f005cfe 100644 +--- tools/CMakeLists.txt ++++ tools/CMakeLists.txt +@@ -8,15 +8,15 @@ set(AUTOMOC ON) + # For now there is only the Akonadi based address backend, and thus + # the findcontact tool is only built if akonadi is there. + # If there are other backends, this must be FIXED. +-if(KF5Akonadi_FOUND) ++if(${AKO_PREFIX}Akonadi_FOUND) + add_executable(${findcontact_NAME} ${FINDCONTACT_SRC}) + + target_link_libraries( ${findcontact_NAME} + Qt5::Core + Qt5::Widgets + KF5::Contacts +- KF5::AkonadiCore +- KF5::AkonadiContact ++ ${AKO_PREFIX}::AkonadiCore ++ ${AKO_PREFIX}::AkonadiContact + ) + + ########### install files ############### +-- +2.41.0 + diff --git a/finance/kraft/files/patch-0002-use-option-to-set-AKO_PREFIX-rather-than-an-internal b/finance/kraft/files/patch-0002-use-option-to-set-AKO_PREFIX-rather-than-an-internal new file mode 100644 index 000000000000..3d556a6e2196 --- /dev/null +++ b/finance/kraft/files/patch-0002-use-option-to-set-AKO_PREFIX-rather-than-an-internal @@ -0,0 +1,25 @@ +From 50e090059365ddbacfd219325095f4f6c5f4aa7b Mon Sep 17 00:00:00 2001 +From: Klaas Freitag +Date: Sat, 29 Apr 2023 22:23:27 +0200 +Subject: [PATCH] use option to set AKO_PREFIX rather than an internal variable + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git CMakeLists.txt CMakeLists.txt +index 8b5374c..f5ecc41 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modul + set(CMAKE_AUTOMOC TRUE) + + # Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23 +-set(AKO_PREFIX "KPim5") ++option(AKO_PREFIX "Akonadi Prefix, either KF5 or KPim5, can be set by -DAKO_PREFIX=KF5" "KPim5") + + include(KDEInstallDirs) + include(KDECMakeSettings) +-- +2.41.0 + diff --git a/finance/kraft/files/patch-0003-Fix-Akonadi-legacy-detection b/finance/kraft/files/patch-0003-Fix-Akonadi-legacy-detection new file mode 100644 index 000000000000..64e346705d25 --- /dev/null +++ b/finance/kraft/files/patch-0003-Fix-Akonadi-legacy-detection @@ -0,0 +1,47 @@ +From 66b64505bbfbc3285ba34ccacdf454720c8e0abc Mon Sep 17 00:00:00 2001 +From: Klaas Freitag +Date: Mon, 1 May 2023 14:09:09 +0200 +Subject: [PATCH] Fix Akonadi legacy detection + +--- + CMakeLists.txt | 8 +++++++- + INSTALL.md | 3 +++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git CMakeLists.txt CMakeLists.txt +index f5ecc41..82b4e07 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -8,8 +8,14 @@ find_package(ECM REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + set(CMAKE_AUTOMOC TRUE) + ++option(AKONADI_LEGACY_BUILD "Build with older versions of Akonadi (KF5 Prefix)" OFF) + # Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23 +-option(AKO_PREFIX "Akonadi Prefix, either KF5 or KPim5, can be set by -DAKO_PREFIX=KF5" "KPim5") ++set(AKO_PREFIX "KPim5") ++ ++if (AKONADI_LEGACY_BUILD) ++ set(AKO_PREFIX "KF5") ++endif() ++message("Akonadi Prefix is ${AKO_PREFIX}") + + include(KDEInstallDirs) + include(KDECMakeSettings) +diff --git INSTALL.md INSTALL.md +index 1edd0ae..77d559c 100644 +--- INSTALL.md ++++ INSTALL.md +@@ -59,6 +59,9 @@ These are optional to build with Akonadi Support: + - akonadi-contact-devel + - akonadi-devel + ++To build with Akonadi versions before 23.04, cmake has to run wtih the ++build option `-DAKONADI_LEGACY_BUILD=ON` to use the old prefix KF5. ++ + ### Build Kraft + + cmake is designed so that the build process can be done in a separate +-- +2.41.0 + diff --git a/finance/kraft/files/patch-0004-Added-Akonadi-version-check-for-some-renamed-compone b/finance/kraft/files/patch-0004-Added-Akonadi-version-check-for-some-renamed-compone new file mode 100644 index 000000000000..4327b0469e5a --- /dev/null +++ b/finance/kraft/files/patch-0004-Added-Akonadi-version-check-for-some-renamed-compone @@ -0,0 +1,147 @@ +From 51563665cb6b113881e8f1efe00f3df2df48d1f5 Mon Sep 17 00:00:00 2001 +From: Klaas Freitag +Date: Tue, 29 Aug 2023 21:03:40 +0200 +Subject: [PATCH] Added Akonadi version check for some renamed components + (#210) + +* Added Akonadi version check for some renamed components + +Akonadi renamed the contact viewer and editors namespace. + +kudos to @t-8ch +--- + CMakeLists.txt | 10 +++++++++- + src/CMakeLists.txt | 1 + + src/addressselectorwidget.cpp | 20 +++++++++++++++----- + src/addressselectorwidget.h | 15 +++++++++++++-- + 4 files changed, 38 insertions(+), 8 deletions(-) + +diff --git CMakeLists.txt CMakeLists.txt +index 0f5541d..0cd73f9 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -109,7 +109,15 @@ set_package_properties(${AKO_PREFIX}AkonadiContact PROPERTIES + TYPE OPTIONAL + ) + +-if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND) ++find_package(${AKO_PREFIX}ContactEditor) ++set_package_properties(${AKO_PREFIX}ContactEditor PROPERTIES ++ DESCRIPTION "Library for editing contacts stored in Akonadi" ++ URL "https://www.kde.org/" ++ PURPOSE "Optionally used for addressbook integration" ++ TYPE OPTIONAL ++) ++ ++if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND AND ${AKO_PREFIX}ContactEditor_FOUND) + add_definitions(-DHAVE_AKONADI) + endif() + +diff --git src/CMakeLists.txt src/CMakeLists.txt +index a2bc5dc..eac624d 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -173,6 +173,7 @@ if(${AKO_PREFIX}Akonadi_FOUND) + list(APPEND KRAFT_LINK_LIBS + ${AKO_PREFIX}::AkonadiCore + ${AKO_PREFIX}::AkonadiContact ++ ${AKO_PREFIX}::ContactEditor + ${AKO_PREFIX}::AkonadiAgentBase + ${AKO_PREFIX}::AkonadiWidgets + ${AKO_PREFIX}::AkonadiXml +diff --git src/addressselectorwidget.cpp src/addressselectorwidget.cpp +index fd08363..1cf2317 100644 +--- src/addressselectorwidget.cpp ++++ src/addressselectorwidget.cpp +@@ -235,7 +235,11 @@ KraftContactViewer::KraftContactViewer(QWidget *parent) + lay->setMargin(0); + setLayout(lay); + #ifdef HAVE_AKONADI ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++ _contactViewer = new ContactEditor::ContactViewer; ++#else + _contactViewer = new Akonadi::ContactViewer; ++#endif + _contactViewer->setShowQRCode(false); + + lay->addWidget(_contactViewer); +@@ -372,9 +376,12 @@ bool AddressSelectorWidget::backendUp() const + void AddressSelectorWidget::slotCreateNewContact() + { + #ifdef HAVE_AKONADI +- // FIXME +-_addressEditor.reset(new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::CreateMode, this )); +-_addressEditor->show(); ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++ _addressEditor = new ContactEditor::ContactEditorDialog(ContactEditor::ContactEditorDialog::EditMode, this ); ++#else ++ _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::CreateMode, this ); ++#endif ++ _addressEditor->show(); + #endif + } + +@@ -398,13 +405,16 @@ void AddressSelectorWidget::slotAddresseeSelected(QModelIndex index) + void AddressSelectorWidget::slotEditContact() + { + #ifdef HAVE_AKONADI +- + if( _addressTreeView->selectionModel()->hasSelection() ) { + QModelIndex index = _addressTreeView->selectionModel()->currentIndex(); + if ( index.isValid() ) { + const Akonadi::Item item = index.data( Akonadi::EntityTreeModel::ItemRole ).value(); + if ( item.isValid() && item.hasPayload() ) { +- _addressEditor.reset(new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::EditMode, this )); ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++ _addressEditor = new ContactEditor::ContactEditorDialog(ContactEditor::ContactEditorDialog::EditMode, this ); ++#else ++ _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::CreateMode, this ); ++#endif + _addressEditor->setContact( item ); + _addressEditor->show(); + } +diff --git src/addressselectorwidget.h src/addressselectorwidget.h +index 4c5ec3e..70d9759 100644 +--- src/addressselectorwidget.h ++++ src/addressselectorwidget.h +@@ -30,7 +30,10 @@ + #else + #define AKONADICONTACT_VERSION AKONADI_VERSION + #endif +-#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++#include ++#include ++#elif AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) + #include + #include + #else +@@ -66,8 +69,12 @@ class KraftContactViewer : public QWidget + + private: + #ifdef HAVE_AKONADI ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++ ContactEditor::ContactViewer *_contactViewer; ++#else + Akonadi::ContactViewer *_contactViewer; + #endif ++#endif + }; + + class AddressSortProxyModel : public QSortFilterProxyModel +@@ -124,7 +131,11 @@ private: + QTreeView *_addressTreeView; + KraftContactViewer *_contactViewer; + #ifdef HAVE_AKONADI +- QScopedPointer _addressEditor; ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0) ++ ContactEditor::ContactEditorDialog *_addressEditor; ++#else ++ Akonadi::ContactEditorDialog *_addressEditor; ++#endif + #endif + }; + +-- +2.41.0 +