Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 88e440ed11 | |||
|
47cd2d4553 | ||
| 308e4a6037 | |||
|
|
3e65b122de | ||
|
|
e4a350d084 | ||
|
|
bdac7aac69 | ||
|
|
c7bb3e37aa |
58
0001-Add-missing-find_package-for-QtSqlPrivate.patch
Normal file
58
0001-Add-missing-find_package-for-QtSqlPrivate.patch
Normal file
@@ -0,0 +1,58 @@
|
||||
From e191896a551d5b0623444143683ac9cf854f74e5 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Fella <nicolas.fella@gmx.de>
|
||||
Date: Mon, 15 Sep 2025 16:21:12 +0200
|
||||
Subject: [PATCH] Add missing find_package for QtSqlPrivate
|
||||
|
||||
Since Qt 6.10 the private parts are split into a separate CMake package
|
||||
|
||||
BUG: 509512
|
||||
---
|
||||
.gitlab-ci.yml | 2 ++
|
||||
.kde-ci.yml | 2 +-
|
||||
CMakeLists.txt | 4 ++++
|
||||
3 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
||||
index 1ba6603..0595322 100644
|
||||
--- a/.gitlab-ci.yml
|
||||
+++ b/.gitlab-ci.yml
|
||||
@@ -4,6 +4,8 @@ include:
|
||||
file:
|
||||
- /gitlab-templates/json-validation.yml
|
||||
- /gitlab-templates/linux.yml
|
||||
+ - /gitlab-templates/linux-qt6.yml
|
||||
+ - /gitlab-templates/linux-qt6-next.yml
|
||||
- /gitlab-templates/freebsd-qt6.yml
|
||||
- /gitlab-templates/windows-qt6.yml
|
||||
- /gitlab-templates/craft-appimage-qt6.yml
|
||||
diff --git a/.kde-ci.yml b/.kde-ci.yml
|
||||
index ad5c942..f3facd4 100644
|
||||
--- a/.kde-ci.yml
|
||||
+++ b/.kde-ci.yml
|
||||
@@ -30,7 +30,7 @@ Dependencies:
|
||||
# 'pim/kidentitymanagement': '@stable'
|
||||
'office/alkimia': '@latest'
|
||||
|
||||
-- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
|
||||
+- 'on': ['Linux/Qt6', 'Linux/Qt6Next', 'FreeBSD/Qt6', 'Windows/Qt6']
|
||||
'require':
|
||||
'frameworks/extra-cmake-modules': '@latest-kf6'
|
||||
'frameworks/kcmutils': '@latest-kf6'
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 32e2840..044c21e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -185,6 +185,10 @@ 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)
|
||||
|
||||
+if (Qt6Sql_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
||||
+ find_package(Qt6 REQUIRED COMPONENTS SqlPrivate)
|
||||
+endif()
|
||||
+
|
||||
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)
|
||||
|
||||
# For KF < 5.100 we need to fix a few method names that
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From a6542b9eb6f50925ee41e246aa4d17b789b3b1f1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Baumgart <thb@net-bembel.de>
|
||||
Date: Mon, 16 Jun 2025 07:14:34 +0200
|
||||
Subject: [PATCH] Adjustments for port to Qt6
|
||||
|
||||
---
|
||||
kmymoney/plugins/kbanking/CMakeLists.txt | 4 ++--
|
||||
kmymoney/plugins/kbanking/aqbankingkmmoperators.h | 1 -
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kmymoney/plugins/kbanking/CMakeLists.txt b/kmymoney/plugins/kbanking/CMakeLists.txt
|
||||
index 5c2314753..3b1d8fe51 100644
|
||||
--- a/kmymoney/plugins/kbanking/CMakeLists.txt
|
||||
+++ b/kmymoney/plugins/kbanking/CMakeLists.txt
|
||||
@@ -55,11 +55,11 @@ target_link_libraries(kbanking
|
||||
Alkimia::alkimia
|
||||
gwenhywfar::core
|
||||
gwenhywfar::gui-cpp
|
||||
- gwenhywfar::gui-qt5
|
||||
+ gwenhywfar::gui-qt${QT_MAJOR_VERSION}
|
||||
aqbanking::aqbanking
|
||||
)
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install(FILES kbanking.kcfg
|
||||
- DESTINATION ${KCFG_INSTALL_DIR})
|
||||
+ DESTINATION ${KDE_INSTALL_KCFGDIR})
|
||||
diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
|
||||
index bbec9953f..c7358c465 100644
|
||||
--- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
|
||||
+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
|
||||
@@ -14,7 +14,6 @@
|
||||
|
||||
#include <QSharedPointer>
|
||||
|
||||
-#include "onlinetasks/interfaces/tasks/ionlinetasksettings.h"
|
||||
#include "onlinetasks/sepa/sepaonlinetransfer.h"
|
||||
|
||||
struct AB_ACCOUNT_SPEC;
|
||||
--
|
||||
2.50.0
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 8c4b84f290e50e62fbf90a61df8c701140a42715 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Baumgart <thb@net-bembel.de>
|
||||
Date: Mon, 23 Jun 2025 10:15:20 +0200
|
||||
Subject: [PATCH] Port triggering actions to Qt6
|
||||
|
||||
Qt6 requires a QAction to be enabled to be triggered programmatically.
|
||||
|
||||
BUG: 505977
|
||||
FIXED-IN: 5.2.1
|
||||
---
|
||||
kmymoney/kmymoney.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp
|
||||
index de03c0ddb..582a391bf 100644
|
||||
--- a/kmymoney/kmymoney.cpp
|
||||
+++ b/kmymoney/kmymoney.cpp
|
||||
@@ -1090,7 +1090,10 @@ KMyMoneyApp::KMyMoneyApp(QWidget* parent)
|
||||
|
||||
connect(d->m_myMoneyView, &KMyMoneyView::requestActionTrigger, this, [&](eMenu::Action action) {
|
||||
if (pActions.contains(action)) {
|
||||
+ const bool enabled = pActions[action]->isEnabled();
|
||||
+ pActions[action]->setEnabled(true);
|
||||
pActions[action]->trigger();
|
||||
+ pActions[action]->setEnabled(enabled);
|
||||
}
|
||||
});
|
||||
|
||||
--
|
||||
2.50.0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f308b0a2297f22f43d9bbe46b4c7dc6aac08bd594454e635a844d06abda4d33c
|
||||
size 11132112
|
||||
@@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Comment: http://www.net-bembel.de/
|
||||
|
||||
iQIzBAABCgAdFiEEldM0sAUOY2HYD2VASQpC8iaztXcFAmhWv9kACgkQSQpC8iaz
|
||||
tXchhxAA2J4YVBvz86r2Nd0XBVOAac6JiObKh5CSe8rWVWsCv69N2GIk4WSqpbPv
|
||||
hwF6vBvzcLdxSMUHzvamlosFaw1VV8x84/LP9kHINwq6URnuqKMM51jC/nS9dPmo
|
||||
k+zA5wivLK7w1ww7LeKfIHlKMDekCGAal+qO+GnTkD6JqgTMDknycHrHA5T6W/Qv
|
||||
pmK7Avq6AZw8f9w6quHvihGmNNDw0bHiyKXiuuBL1t80tZKK3uLrb4JiRyNiQksJ
|
||||
httEEFCCYGZX78wQyD5RxMNXkIkwTYWPBIT6Jwj0QPMeHo1kwm+jDLgIO2M1fuqL
|
||||
3Iof3QdYhhDWPeUMW4ybVSNt/DEUFN4hR8g75WM93lY73NLXwIiLs0MGWV9QJO58
|
||||
92OWeiMVSYOlHvhOnT0BI5RYNtgC9zFR3fGbqbrAr3kj+NyVS50DsDWAA8QjDzK/
|
||||
LquYPRP4BqNK+mpe/g0i8dUUniH1L9Vx05Hj7eDkzno6lXtXJjEcc9bO1SZocczf
|
||||
uns4sdnPK3p+WugLIIuCVgd/xyXyIr94qqgNubNQZhT5UCWu0d0u7gNLwttAXVcw
|
||||
ULCoapuzPqyB9D8ODqFCjswD96i/mcC90CYTmG2JWBhZ7jezFqUB7UhlF6M/OF/e
|
||||
KQjLjxgQjVIJtPAFq5aQYI/WqRDVDE7RT1CnDiFKgTX7CvrySbE=
|
||||
=iDDx
|
||||
-----END PGP SIGNATURE-----
|
||||
3
kmymoney-5.2.1.tar.xz
Normal file
3
kmymoney-5.2.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:feadf40b6d4c90d77e32716a858dd23769081863104d8cea62910b1ec3e4336b
|
||||
size 11124956
|
||||
17
kmymoney-5.2.1.tar.xz.sig
Normal file
17
kmymoney-5.2.1.tar.xz.sig
Normal file
@@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Comment: http://www.net-bembel.de/
|
||||
|
||||
iQIzBAABCgAdFiEEldM0sAUOY2HYD2VASQpC8iaztXcFAmiQk5MACgkQSQpC8iaz
|
||||
tXeZWRAA3aV4EHKEnp9d++jnbuYpakXB0NTq9/DYzM6M19SHSW6c10y7eyLilLty
|
||||
EPBxkp5I3rRbZtXA785VlTr/J+MKTDi4UHIanLQGOIPxhxiaI5lfGghQwNOV+j8B
|
||||
3d4ZWznkiBFlNQxXSc9GcGlKwlLtooQUzJJbOtsiwcqzu5L4sZ/znQZpDFT7Cssm
|
||||
KV+ZgUEgc6BSG69zkTlQ0lr3WJA9vK0cBIAw4EXvtxPB+hY01w3yG1uW8Prkh32M
|
||||
dLmDSon4nDEKjTtUPFuoTegCWEGrWKQ6PyOAToDZjW0aGDariAEYdmmNZ1Yz75wP
|
||||
QRxENkbe2GIBQBNy5iPvSHN9HJCVukkQTMTzLDGUU8HuQc181L7fgGOhGCqyhiC9
|
||||
GLuyuAnh7ZbcqkEDY7mKsNYTc2jQSppsjVIH/5rAAAgFPr/eILhaECRs/qQ9eklO
|
||||
wLdydpTTzwoddS+CLIL7ui6AAcxk3v+PJqr1jWX+1xcmNHE99XSiMMx9hj3X/70Q
|
||||
TO7yQbD5N2+/2IcI7A+X6cs2T/KvaXk9GKpM3PV3DwB7/g+7mdSe1jAYSqGAe7IK
|
||||
UTLOOgB6FSRe3DJzN+TCVwEopGybJdt6425efCJKMczpQ6MlYz94cWOrzK7HexQs
|
||||
QiqdfLqLlJRImdGqQbhZGwgdJW/+Ajk5nAmxtd11KkpEFWDLX+c=
|
||||
=EwOb
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 13 12:31:50 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add upstream change:
|
||||
* 0001-Add-missing-find_package-for-QtSqlPrivate.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 5 12:01:38 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 5.2.1
|
||||
https://kmymoney.org/2025/08/04/kmymoney-5-2-1-released.html
|
||||
- Drop patches, merged upstream:
|
||||
* 0001-Port-triggering-actions-to-Qt6.patch
|
||||
* 0001-Adjustments-for-port-to-Qt6.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 25 12:03:35 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kmymoney
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
%bcond_without released
|
||||
Name: kmymoney
|
||||
Version: 5.2.0
|
||||
Version: 5.2.1
|
||||
Release: 0
|
||||
Summary: A Personal Finance Manager by KDE
|
||||
License: GPL-2.0-only OR GPL-3.0-only
|
||||
@@ -32,12 +32,10 @@ Source1: https://download.kde.org/stable/kmymoney/%{version}/%{name}-%{ve
|
||||
Source2: kmymoney.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-Port-triggering-actions-to-Qt6.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Adjustments-for-port-to-Qt6.patch
|
||||
Patch0: 0001-Add-missing-find_package-for-QtSqlPrivate.patch
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: libofx-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
@@ -49,6 +47,7 @@ BuildRequires: cmake(KF6Config) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Contacts) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Crash) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Holidays) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
|
||||
@@ -63,7 +62,7 @@ BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
|
||||
BuildRequires: cmake(KPim6Akonadi)
|
||||
BuildRequires: cmake(KPim6IdentityManagementCore)
|
||||
BuildRequires: cmake(LibAlkimia6) >= 8.1.90
|
||||
BuildRequires: cmake(LibAlkimia6) >= 8.2.1
|
||||
BuildRequires: cmake(PlasmaActivities)
|
||||
BuildRequires: cmake(QGpgmeQt6)
|
||||
BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version}
|
||||
@@ -78,10 +77,10 @@ BuildRequires: cmake(Qt6Svg) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Test) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Xml) >= %{qt6_version}
|
||||
BuildRequires: cmake(aqbanking) >= 6.5.0
|
||||
BuildRequires: cmake(aqbanking) >= 6.6.1
|
||||
BuildRequires: cmake(gwengui-cpp)
|
||||
BuildRequires: cmake(gwengui-qt6)
|
||||
BuildRequires: cmake(gwenhywfar) >= 5.10.1
|
||||
BuildRequires: cmake(gwenhywfar) >= 5.12.1
|
||||
BuildRequires: pkgconfig(libical)
|
||||
BuildRequires: pkgconfig(sqlcipher)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
@@ -142,6 +141,7 @@ Development files and headers need to build software using KMyMoney.
|
||||
%{_kf6_iconsdir}/hicolor/*/*/*
|
||||
%{_kf6_libdir}/libkmm_base_dialogs.so.*
|
||||
%{_kf6_libdir}/libkmm_base_widgets.so.*
|
||||
%{_kf6_libdir}/libkmm_codec.so.*
|
||||
%{_kf6_libdir}/libkmm_csvimportercore.so.*
|
||||
%{_kf6_libdir}/libkmm_extended_dialogs.so.*
|
||||
%{_kf6_libdir}/libkmm_gpgfile.so.*
|
||||
@@ -171,6 +171,7 @@ Development files and headers need to build software using KMyMoney.
|
||||
%{_includedir}/kmymoney/
|
||||
%{_kf6_libdir}/libkmm_base_dialogs.so
|
||||
%{_kf6_libdir}/libkmm_base_widgets.so
|
||||
%{_kf6_libdir}/libkmm_codec.so
|
||||
%{_kf6_libdir}/libkmm_csvimportercore.so
|
||||
%{_kf6_libdir}/libkmm_extended_dialogs.so
|
||||
%{_kf6_libdir}/libkmm_gpgfile.so
|
||||
|
||||
Reference in New Issue
Block a user