[neon/extras/kmymoney/Neon/release] debian/patches: kpim6.diff
Carlos De Maine
null at kde.org
Wed Sep 3 07:07:37 BST 2025
Git commit e0e1a1087cb313bdc3fa6b0c8af618d47a3151cc by Carlos De Maine.
Committed on 03/09/2025 at 06:07.
Pushed by carlosdem into branch 'Neon/release'.
kpim6.diff
M +88 -37 debian/patches/kpim6.diff
M +1 -1 debian/patches/series
https://invent.kde.org/neon/extras/kmymoney/-/commit/e0e1a1087cb313bdc3fa6b0c8af618d47a3151cc
diff --git a/debian/patches/kpim6.diff b/debian/patches/kpim6.diff
index fc5ed72..b5bd2e6 100644
--- a/debian/patches/kpim6.diff
+++ b/debian/patches/kpim6.diff
@@ -1,51 +1,102 @@
+commit 2dabfad37c3c4c8806e7b96b2ca643df8d7e720a
+Author: Carlos De Maine <carlosdemaine at gmail.com>
+Date: Wed Sep 3 15:39:09 2025 +1000
+
+ KPim6IdentityManagementCore
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb7f90d40..7e15347bc 100644
+index fb7f90d40..5418353d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -218,16 +218,16 @@ find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} OPTIONAL_COMPONENTS DocTool
- if (DEFINED AKONADI_MIN_VERSION)
- # Akonadi 23.04 moved to KPim5 prefix, deprecating KF5
- set(PIMPREFIX KPim${QT_MAJOR_VERSION})
-- find_package(${PIMPREFIX}Akonadi ${AKONADI_MIN_VERSION} QUIET)
-+ find_package(${PIMPREFIX}Akonadi ${AKONADI_MIN_VERSION} )
- if(NOT ${PIMPREFIX}Akonadi_FOUND)
- set(PIMPREFIX KF${QT_MAJOR_VERSION})
-- find_package(${PIMPREFIX}Akonadi ${AKONADI_MIN_VERSION} QUIET)
-+ find_package(${PIMPREFIX}Akonadi ${AKONADI_MIN_VERSION} )
- endif()
- if(${PIMPREFIX}Akonadi_FOUND)
+@@ -227,7 +227,7 @@ if (DEFINED AKONADI_MIN_VERSION)
# for config-kmymoney.h.cmake
set(ADDRESSBOOK_VERSION ${${PIMPREFIX}Akonadi_VERSION})
endif()
- find_package(${PIMPREFIX}IdentityManagement ${AKONADI_MIN_VERSION} QUIET)
-+ find_package(${PIMPREFIX}IdentityManagementCore ${AKONADI_MIN_VERSION} )
++ find_package(${PIMPREFIX}IdentityManagementCore ${AKONADI_MIN_VERSION} QUIET)
endif()
find_package(Qt${QT_MAJOR_VERSION}Keychain CONFIG REQUIRED)
-@@ -245,9 +245,9 @@ if (NOT LibAlkimia${QT_MAJOR_VERSION}_FOUND)
+@@ -321,7 +321,7 @@ if(QT_MAJOR_VERSION LESS 6)
endif()
- if(BUILD_WITH_QT6)
-- find_package(KChart6 ${KMM_KCHART_MIN_VERSION} QUIET)
-+ find_package(KChart6 ${KMM_KCHART_MIN_VERSION} )
- else()
-- find_package(KChart ${KMM_KCHART_MIN_VERSION} QUIET)
-+ find_package(KChart ${KMM_KCHART_MIN_VERSION} )
+ cmake_dependent_option(ENABLE_ADDRESSBOOK "Enable addressbook support." ON
+- "${PIMPREFIX}IdentityManagement_FOUND;${PIMPREFIX}Akonadi_FOUND;KF${QT_MAJOR_VERSION}Contacts_FOUND" OFF)
++ "${PIMPREFIX}IdentityManagementCore_FOUND;${PIMPREFIX}Akonadi_FOUND;KF${QT_MAJOR_VERSION}Contacts_FOUND" OFF)
+
+ add_feature_info("Address book" ENABLE_ADDRESSBOOK "Allows fetching payee information from KDE PIM system.")
+
+commit 2dabfad37c3c4c8806e7b96b2ca643df8d7e720a
+Author: Carlos De Maine <carlosdemaine at gmail.com>
+Date: Wed Sep 3 15:39:09 2025 +1000
+
+ KPim6IdentityManagementCore
+
+diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
+index 8a908224e..8597601e2 100644
+--- a/kmymoney/mymoney/CMakeLists.txt
++++ b/kmymoney/mymoney/CMakeLists.txt
+@@ -137,7 +137,7 @@ target_link_libraries(kmm_mymoney
+ )
+
+ if(ENABLE_ADDRESSBOOK)
+-target_link_libraries(kmm_mymoney PUBLIC ${PIMPREFIX}::IdentityManagement ${PIMPREFIX}::AkonadiCore KF${QT_MAJOR_VERSION}::Contacts)
++target_link_libraries(kmm_mymoney PUBLIC ${PIMPREFIX}::IdentityManagementCore ${PIMPREFIX}::AkonadiCore KF${QT_MAJOR_VERSION}::Contacts)
endif()
- # we want the lowercase 'libofx' package name, for 'libofx_FOUND' compatibility with what pkg-config returns,
-@@ -374,10 +374,10 @@ cmake_dependent_option(ENABLE_IBANBICDATA "Enable IBAN/BIC data support." OFF
- add_feature_info("IBAN/BIC data" ENABLE_IBANBICDATA "Adds predefined IBAN/BIC numbers to KMyMoney (note: doesn't work yet).")
-
- # check for optional KBanking support
--find_package(aqbanking ${KMM_AQBANKING_MIN_VERSION} QUIET)
--find_package(gwenhywfar ${KMM_GWENHYWFAR_MIN_VERSION} QUIET)
--find_package(gwengui-cpp QUIET)
--find_package(gwengui-qt${QT_MAJOR_VERSION} QUIET)
-+find_package(aqbanking ${KMM_AQBANKING_MIN_VERSION} )
-+find_package(gwenhywfar ${KMM_GWENHYWFAR_MIN_VERSION} )
-+find_package(gwengui-cpp )
-+find_package(gwengui-qt${QT_MAJOR_VERSION} )
-
- cmake_dependent_option(ENABLE_KBANKING "Enable KBanking plugin" ON
- "AQBANKING_FOUND;gwengui-cpp_FOUND;gwengui-qt${QT_MAJOR_VERSION}_FOUND;Qt${QT_MAJOR_VERSION}QuickWidgets_FOUND" OFF)
+ set_target_properties(kmm_mymoney PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+
+commit 2dabfad37c3c4c8806e7b96b2ca643df8d7e720a
+Author: Carlos De Maine <carlosdemaine at gmail.com>
+Date: Wed Sep 3 15:39:09 2025 +1000
+
+ KPim6IdentityManagementCore
+
+diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
+index 5d6ad06ba..5fd2573a2 100644
+--- a/kmymoney/mymoney/mymoneycontact.cpp
++++ b/kmymoney/mymoney/mymoneycontact.cpp
+@@ -8,8 +8,8 @@
+ #include "mymoneycontact.h"
+
+ #ifdef ENABLE_ADDRESSBOOK
+-#include <KIdentityManagement/Identity>
+-#include <KIdentityManagement/IdentityManager>
++#include <KIdentityManagementCore/Identity>
++#include <KIdentityManagementCore/IdentityManager>
+ #include <akonadi_version.h>
+
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+@@ -33,8 +33,8 @@ MyMoneyContact::MyMoneyContact(QObject *parent) : QObject(parent)
+ bool MyMoneyContact::ownerExists() const
+ {
+ #ifdef ENABLE_ADDRESSBOOK
+- KIdentityManagement::IdentityManager im;
+- KIdentityManagement::Identity id = im.defaultIdentity();
++ KIdentityManagementCore::IdentityManager im;
++ KIdentityManagementCore::Identity id = im.defaultIdentity();
+ return !id.isNull();
+ #else
+ return false;
+@@ -44,8 +44,8 @@ bool MyMoneyContact::ownerExists() const
+ QString MyMoneyContact::ownerEmail() const
+ {
+ #ifdef ENABLE_ADDRESSBOOK
+- KIdentityManagement::IdentityManager im;
+- KIdentityManagement::Identity id = im.defaultIdentity();
++ KIdentityManagementCore::IdentityManager im;
++ KIdentityManagementCore::Identity id = im.defaultIdentity();
+ return id.primaryEmailAddress();
+ #else
+ return QString();
+@@ -55,8 +55,8 @@ QString MyMoneyContact::ownerEmail() const
+ QString MyMoneyContact::ownerFullName() const
+ {
+ #ifdef ENABLE_ADDRESSBOOK
+- KIdentityManagement::IdentityManager im;
+- KIdentityManagement::Identity id = im.defaultIdentity();
++ KIdentityManagementCore::IdentityManager im;
++ KIdentityManagementCore::Identity id = im.defaultIdentity();
+ return id.fullName();
+ #else
+ return QString();
diff --git a/debian/patches/series b/debian/patches/series
index 10457ef..ebc43a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
neon_libofx_MOD_VERSION.diff
-kpim6.diff
\ No newline at end of file
+kpim6.diff
More information about the Neon-commits
mailing list