From 2576226f738a8718e5511b2fdcdbd3666c826c28 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Mon, 23 Feb 2026 09:21:43 +0000 Subject: [PATCH] Update kmymoney to 5.2.2 --- productivity/kmymoney/Makefile | 42 ++++++----- productivity/kmymoney/distinfo | 4 +- .../kmymoney/patches/patch-CMakeLists_txt | 10 +-- .../patches/patch-kmymoney_kmymoney_cpp | 2 +- ...ey_plugins_gnc_import_mymoneygncreader_cpp | 12 --- ...oney_plugins_gnc_import_mymoneygncreader_h | 14 ---- productivity/kmymoney/pkg/PLIST | 74 ++++++++++++++++++- 7 files changed, 101 insertions(+), 57 deletions(-) delete mode 100644 productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_cpp delete mode 100644 productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_h diff --git a/productivity/kmymoney/Makefile b/productivity/kmymoney/Makefile index bbc40ef6e86..1f9ce92b65b 100644 --- a/productivity/kmymoney/Makefile +++ b/productivity/kmymoney/Makefile @@ -2,9 +2,8 @@ USE_WXNEEDED = Yes COMMENT = personal finance manager -V = 5.2.1 +V = 5.2.2 DISTNAME = kmymoney-${V} -REVISION = 1 CATEGORIES = productivity x11 @@ -13,8 +12,8 @@ HOMEPAGE = https://kmymoney.org SHARED_LIBS += kmm_csvimportercore 1.0 # 5.2.0 SHARED_LIBS += kmm_icons 1.0 # 5.2.0 SHARED_LIBS += kmm_menus 1.0 # 5.2.0 -SHARED_LIBS += kmm_models 1.0 # 5.2.0 -SHARED_LIBS += kmm_mymoney 2.0 # 5.2.0 +SHARED_LIBS += kmm_models 1.1 # 5.2.0 +SHARED_LIBS += kmm_mymoney 3.0 # 5.2.0 SHARED_LIBS += kmm_payeeidentifier 1.0 # 5.1.0 SHARED_LIBS += kmm_plugin 1.0 # 5.2.0 SHARED_LIBS += kmm_printer 1.0 # 5.2.0 @@ -22,7 +21,7 @@ SHARED_LIBS += kmm_settings 1.0 # 5.2.0 SHARED_LIBS += kmm_widgets 2.0 # 5.2.0 SHARED_LIBS += kmm_base_dialogs 0.0 # 0.0 -SHARED_LIBS += kmm_base_widgets 0.0 # 0.0 +SHARED_LIBS += kmm_base_widgets 1.0 # 0.0 SHARED_LIBS += kmm_extended_dialogs 0.0 # 0.0 SHARED_LIBS += kmm_gpgfile 0.0 # 0.0 SHARED_LIBS += kmm_keychain 0.0 # 0.0 @@ -45,18 +44,19 @@ EXTRACT_SUFX = .tar.xz WANTLIB += ${COMPILER_LIBCXX} GL KChart6 KF6Archive KF6Bookmarks WANTLIB += KF6Codecs KF6ColorScheme KF6Completion KF6ConfigCore -WANTLIB += KF6ConfigGui KF6ConfigWidgets KF6CoreAddons KF6Crash -WANTLIB += KF6GuiAddons KF6Holidays KF6I18n KF6ItemModels KF6ItemViews -WANTLIB += KF6JobWidgets KF6KCMUtils KF6KCMUtilsCore KF6KCMUtilsQuick -WANTLIB += KF6KIOCore KF6KIOFileWidgets KF6KIOGui KF6KIOWidgets -WANTLIB += KF6Notifications KF6Service KF6Solid KF6SonnetUi KF6TextWidgets -WANTLIB += KF6WidgetsAddons KF6XmlGui Qt6Concurrent Qt6Core Qt6DBus -WANTLIB += Qt6Gui Qt6Network Qt6OpenGL Qt6Positioning Qt6PrintSupport -WANTLIB += Qt6Qml Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript Qt6Quick -WANTLIB += Qt6Sql Qt6WebChannel Qt6WebEngineCore Qt6WebEngineWidgets -WANTLIB += Qt6Widgets Qt6Xml alkimia6 assuan c db db_cxx gmp gpgme -WANTLIB += gpgmepp ical icalss icalvcal icudata icui18n icuuc -WANTLIB += m ofx ${MODPY_WANTLIB} qgpgmeqt6 qt6keychain sqlcipher +WANTLIB += KF6ConfigGui KF6ConfigWidgets KF6Contacts KF6CoreAddons +WANTLIB += KF6Crash KF6GuiAddons KF6Holidays KF6I18n KF6ItemModels +WANTLIB += KF6ItemViews KF6JobWidgets KF6KCMUtils KF6KCMUtilsCore +WANTLIB += KF6KCMUtilsQuick KF6KIOCore KF6KIOFileWidgets KF6KIOGui +WANTLIB += KF6KIOWidgets KF6Notifications KF6Service KF6Solid +WANTLIB += KF6SonnetUi KF6TextWidgets KF6WidgetsAddons KF6XmlGui +WANTLIB += KPim6AkonadiCore KPim6AkonadiPrivate KPim6IdentityManagementCore +WANTLIB += Qt6Concurrent Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6OpenGL +WANTLIB += Qt6Positioning Qt6PrintSupport Qt6Qml Qt6Quick Qt6Sql +WANTLIB += Qt6WebChannel Qt6WebEngineCore Qt6WebEngineWidgets +WANTLIB += Qt6Widgets Qt6Xml alkimia6 c db db_cxx gmp gpg-error +WANTLIB += gpgme gpgmepp ical icalss icalvcal icudata icui18n +WANTLIB += icuuc m ofx ${MODPY_WANTLIB} qgpgmeqt6 qt6keychain sqlcipher MODULES = lang/python \ devel/kf6 @@ -90,7 +90,9 @@ LIB_DEPENDS = databases/db/v4 \ devel/kf6/kcompletion \ devel/kf6/kconfig \ devel/kf6/kconfigwidgets \ + devel/kf6/kcontacts \ devel/kf6/kcoreaddons \ + devel/kf6/kcrash \ devel/kf6/kguiaddons \ devel/kf6/kholidays \ devel/kf6/ki18n \ @@ -98,7 +100,6 @@ LIB_DEPENDS = databases/db/v4 \ devel/kf6/kitemmodels \ devel/kf6/kitemviews \ devel/kf6/kjobwidgets \ - devel/kf6/kcrash \ devel/kf6/knotifications \ devel/kf6/kservice \ devel/kf6/ktextwidgets \ @@ -109,11 +110,12 @@ LIB_DEPENDS = databases/db/v4 \ devel/libofx \ graphics/kdiagram \ productivity/libalkimia>=8.2.1 \ - security/qtkeychain,qt6 \ security/qgpgme \ - security/libassuan \ + security/qtkeychain,qt6 \ textproc/icu4c \ textproc/libical \ + x11/kde-applications/akonadi \ + x11/kde-applications/kidentitymanagement \ x11/qt6/qtdeclarative \ x11/qt6/qtpositioning \ x11/qt6/qtwebchannel \ diff --git a/productivity/kmymoney/distinfo b/productivity/kmymoney/distinfo index 1ddec38bab8..560a01d1ef2 100644 --- a/productivity/kmymoney/distinfo +++ b/productivity/kmymoney/distinfo @@ -1,2 +1,2 @@ -SHA256 (kmymoney-5.2.1.tar.xz) = /q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s= -SIZE (kmymoney-5.2.1.tar.xz) = 11124956 +SHA256 (kmymoney-5.2.2.tar.xz) = QLZjnmohYQDSAkjtdPoVQgL5zN+8M1Inztwb746l03c= +SIZE (kmymoney-5.2.2.tar.xz) = 11354812 diff --git a/productivity/kmymoney/patches/patch-CMakeLists_txt b/productivity/kmymoney/patches/patch-CMakeLists_txt index 1e3293d6c8d..74682d383fc 100644 --- a/productivity/kmymoney/patches/patch-CMakeLists_txt +++ b/productivity/kmymoney/patches/patch-CMakeLists_txt @@ -2,16 +2,16 @@ https://src.fedoraproject.org/rpms/kmymoney/blob/rawhide/f/kmymoney-fix-build-ag Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -183,7 +183,7 @@ if (PkgConfig_FOUND) +@@ -196,7 +196,7 @@ if (PkgConfig_FOUND) endif() find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport) -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets) +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql SqlPrivate Concurrent QuickWidgets) - find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets Crash I18n Completion KCMUtils ItemModels ItemViews Service XmlGui TextWidgets Notifications KIO) - -@@ -425,12 +425,14 @@ kde_enable_exceptions() + if (Qt6Sql_VERSION VERSION_GREATER_EQUAL "6.10.0") + find_package(Qt6 REQUIRED COMPONENTS SqlPrivate) +@@ -454,12 +454,14 @@ kde_enable_exceptions() # There is no way to detect linker in cmake (see https://gitlab.kitware.com/cmake/cmake/issues/17596) # and linkers aren't compatible with each other, so we need to assume something @@ -28,7 +28,7 @@ Index: CMakeLists.txt set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") # TODO: remove multiple definitions of payeeIdentifierLoader::createPayeeIdentifierFromSqlDatabase -@@ -481,7 +483,9 @@ endif() +@@ -510,7 +512,9 @@ endif() # IDEA: Set on a per target base set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp b/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp index 1161f2290df..ebe219d7907 100644 --- a/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp +++ b/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp @@ -1,7 +1,7 @@ Index: kmymoney/kmymoney.cpp --- kmymoney/kmymoney.cpp.orig +++ kmymoney/kmymoney.cpp -@@ -1042,7 +1042,8 @@ KMyMoneyApp::KMyMoneyApp(QWidget* parent) +@@ -1043,7 +1043,8 @@ KMyMoneyApp::KMyMoneyApp(QWidget* parent) * 3) in a separate, minimal test case, loading libsqlite3 explicitly * with QLibrary::ExportExternalSymbolsHint makes libsqlcipher non-functional */ diff --git a/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_cpp b/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_cpp deleted file mode 100644 index 8928dcf1ce5..00000000000 --- a/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_cpp +++ /dev/null @@ -1,12 +0,0 @@ -Index: kmymoney/plugins/gnc/import/mymoneygncreader.cpp ---- kmymoney/plugins/gnc/import/mymoneygncreader.cpp.orig -+++ kmymoney/plugins/gnc/import/mymoneygncreader.cpp -@@ -2706,4 +2706,8 @@ void MyMoneyGncReader::signalProgress(int current, int - (*m_progressCallback)(current, total, msg); - return ; - } -+ -+unsigned int GncObject::kvpCount() const { -+ return (m_kvpList.count()); -+ } //! - #endif // _GNCFILEANON diff --git a/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_h b/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_h deleted file mode 100644 index ce07c11706b..00000000000 --- a/productivity/kmymoney/patches/patch-kmymoney_plugins_gnc_import_mymoneygncreader_h +++ /dev/null @@ -1,14 +0,0 @@ -Index: kmymoney/plugins/gnc/import/mymoneygncreader.h ---- kmymoney/plugins/gnc/import/mymoneygncreader.h.orig -+++ kmymoney/plugins/gnc/import/mymoneygncreader.h -@@ -253,9 +253,7 @@ class GncObject (protected) - virtual QString var(int i) const; - // anonymize data - virtual QString hide(QString, unsigned int); -- unsigned int kvpCount() const { -- return (m_kvpList.count()); -- } //! -+ unsigned int kvpCount() const; - - MyMoneyGncReader *pMain; // pointer to 'main' class - // used at start of each transaction so same money hide factor is applied to all splits diff --git a/productivity/kmymoney/pkg/PLIST b/productivity/kmymoney/pkg/PLIST index 10ed924300d..5e00b3a8f49 100644 --- a/productivity/kmymoney/pkg/PLIST +++ b/productivity/kmymoney/pkg/PLIST @@ -354,6 +354,7 @@ share/doc/HTML/en/kmymoney/newsched_numbered.png share/doc/HTML/en/kmymoney/payee_history.png share/doc/HTML/en/kmymoney/payee_info.png share/doc/HTML/en/kmymoney/payee_link-matching-ledger.png +share/doc/HTML/en/kmymoney/payee_link-matching-open-url.png share/doc/HTML/en/kmymoney/payee_link-matching.png share/doc/HTML/en/kmymoney/payee_match.png share/doc/HTML/en/kmymoney/payee_widget.png @@ -389,6 +390,7 @@ share/doc/HTML/en/kmymoney/schedpopup.png share/doc/HTML/en/kmymoney/scheduleview.png share/doc/HTML/en/kmymoney/select_currency.png share/doc/HTML/en/kmymoney/select_database.png +share/doc/HTML/en/kmymoney/shortcut-payee-open-url.png share/doc/HTML/en/kmymoney/single_split.png share/doc/HTML/en/kmymoney/split_transaction.png share/doc/HTML/en/kmymoney/split_unassigned.png @@ -471,6 +473,40 @@ share/doc/HTML/nl/kmymoney/introduction.docbook share/doc/HTML/nl/kmymoney/makemostof.docbook share/doc/HTML/nl/kmymoney/reference.docbook share/doc/HTML/nl/kmymoney/whatsnew.docbook +share/doc/HTML/pt_BR/kmymoney/ +share/doc/HTML/pt_BR/kmymoney/credits.docbook +share/doc/HTML/pt_BR/kmymoney/details-accounts.docbook +share/doc/HTML/pt_BR/kmymoney/details-budgets.docbook +share/doc/HTML/pt_BR/kmymoney/details-categories.docbook +share/doc/HTML/pt_BR/kmymoney/details-currencies.docbook +share/doc/HTML/pt_BR/kmymoney/details-database.docbook +share/doc/HTML/pt_BR/kmymoney/details-forecast.docbook +share/doc/HTML/pt_BR/kmymoney/details-formats.docbook +share/doc/HTML/pt_BR/kmymoney/details-impexp-csv.docbook +share/doc/HTML/pt_BR/kmymoney/details-impexp-removed.docbook +share/doc/HTML/pt_BR/kmymoney/details-impexp-woob.docbook +share/doc/HTML/pt_BR/kmymoney/details-impexp.docbook +share/doc/HTML/pt_BR/kmymoney/details-institutions.docbook +share/doc/HTML/pt_BR/kmymoney/details-investments.docbook +share/doc/HTML/pt_BR/kmymoney/details-ledgers.docbook +share/doc/HTML/pt_BR/kmymoney/details-loans.docbook +share/doc/HTML/pt_BR/kmymoney/details-payees.docbook +share/doc/HTML/pt_BR/kmymoney/details-reconciliation.docbook +share/doc/HTML/pt_BR/kmymoney/details-reports.docbook +share/doc/HTML/pt_BR/kmymoney/details-schedules.docbook +share/doc/HTML/pt_BR/kmymoney/details-search.docbook +share/doc/HTML/pt_BR/kmymoney/details-settings.docbook +share/doc/HTML/pt_BR/kmymoney/details-tags.docbook +share/doc/HTML/pt_BR/kmymoney/details-widgets.docbook +share/doc/HTML/pt_BR/kmymoney/faq.docbook +share/doc/HTML/pt_BR/kmymoney/firsttime.docbook +share/doc/HTML/pt_BR/kmymoney/index.cache.bz2 +share/doc/HTML/pt_BR/kmymoney/index.docbook +share/doc/HTML/pt_BR/kmymoney/installation.docbook +share/doc/HTML/pt_BR/kmymoney/introduction.docbook +share/doc/HTML/pt_BR/kmymoney/makemostof.docbook +share/doc/HTML/pt_BR/kmymoney/reference.docbook +share/doc/HTML/pt_BR/kmymoney/whatsnew.docbook share/doc/HTML/ru/kmymoney/ share/doc/HTML/ru/kmymoney/credits.docbook share/doc/HTML/ru/kmymoney/details-accounts.docbook @@ -504,6 +540,41 @@ share/doc/HTML/ru/kmymoney/introduction.docbook share/doc/HTML/ru/kmymoney/makemostof.docbook share/doc/HTML/ru/kmymoney/reference.docbook share/doc/HTML/ru/kmymoney/whatsnew.docbook +share/doc/HTML/sv/kmymoney/ +share/doc/HTML/sv/kmymoney/credits.docbook +share/doc/HTML/sv/kmymoney/details-accounts.docbook +share/doc/HTML/sv/kmymoney/details-budgets.docbook +share/doc/HTML/sv/kmymoney/details-categories.docbook +share/doc/HTML/sv/kmymoney/details-currencies.docbook +share/doc/HTML/sv/kmymoney/details-database.docbook +share/doc/HTML/sv/kmymoney/details-forecast.docbook +share/doc/HTML/sv/kmymoney/details-formats.docbook +share/doc/HTML/sv/kmymoney/details-impexp-csv.docbook +share/doc/HTML/sv/kmymoney/details-impexp-csvexp.docbook +share/doc/HTML/sv/kmymoney/details-impexp-removed.docbook +share/doc/HTML/sv/kmymoney/details-impexp-woob.docbook +share/doc/HTML/sv/kmymoney/details-impexp.docbook +share/doc/HTML/sv/kmymoney/details-institutions.docbook +share/doc/HTML/sv/kmymoney/details-investments.docbook +share/doc/HTML/sv/kmymoney/details-ledgers.docbook +share/doc/HTML/sv/kmymoney/details-loans.docbook +share/doc/HTML/sv/kmymoney/details-payees.docbook +share/doc/HTML/sv/kmymoney/details-reconciliation.docbook +share/doc/HTML/sv/kmymoney/details-reports.docbook +share/doc/HTML/sv/kmymoney/details-schedules.docbook +share/doc/HTML/sv/kmymoney/details-search.docbook +share/doc/HTML/sv/kmymoney/details-settings.docbook +share/doc/HTML/sv/kmymoney/details-tags.docbook +share/doc/HTML/sv/kmymoney/details-widgets.docbook +share/doc/HTML/sv/kmymoney/faq.docbook +share/doc/HTML/sv/kmymoney/firsttime.docbook +share/doc/HTML/sv/kmymoney/index.cache.bz2 +share/doc/HTML/sv/kmymoney/index.docbook +share/doc/HTML/sv/kmymoney/installation.docbook +share/doc/HTML/sv/kmymoney/introduction.docbook +share/doc/HTML/sv/kmymoney/makemostof.docbook +share/doc/HTML/sv/kmymoney/reference.docbook +share/doc/HTML/sv/kmymoney/whatsnew.docbook share/doc/HTML/uk/kmymoney/ share/doc/HTML/uk/kmymoney/credits.docbook share/doc/HTML/uk/kmymoney/details-accounts.docbook @@ -573,9 +644,6 @@ share/icons/hicolor/64x64/apps/kmymoney.png share/icons/hicolor/64x64/mimetypes/application-x-kmymoney.png share/kconf_update/ share/kconf_update/kmymoney.upd -share/kmymoney/ -share/kmymoney/misc/ -share/kmymoney/misc/financequote.pl share/locale/ar/LC_MESSAGES/kmymoney.mo share/locale/ast/LC_MESSAGES/kmymoney.mo share/locale/bg/LC_MESSAGES/kmymoney.mo