mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
kmymoney, bump to version 5.2.2 (#13774)
This commit is contained in:
@@ -3,11 +3,11 @@ DESCRIPTION="KMyMoney is a cross-platform personal finance manager build on KDE
|
|||||||
technologies for your desktop and notebook environment. It enables users to keep careful track of \
|
technologies for your desktop and notebook environment. It enables users to keep careful track of \
|
||||||
their personal finances by providing a broad array of financial features and tools."
|
their personal finances by providing a broad array of financial features and tools."
|
||||||
HOMEPAGE="https://kmymoney.org/"
|
HOMEPAGE="https://kmymoney.org/"
|
||||||
COPYRIGHT="2010-2025 KDE Organisation"
|
COPYRIGHT="2010-2026 KDE Organisation"
|
||||||
LICENSE="GNU GPL v2"
|
LICENSE="GNU GPL v2"
|
||||||
REVISION="2"
|
REVISION="1"
|
||||||
SOURCE_URI="https://download.kde.org/stable/kmymoney/$portVersion/kmymoney-$portVersion.tar.xz"
|
SOURCE_URI="https://download.kde.org/stable/kmymoney/$portVersion/kmymoney-$portVersion.tar.xz"
|
||||||
CHECKSUM_SHA256="feadf40b6d4c90d77e32716a858dd23769081863104d8cea62910b1ec3e4336b"
|
CHECKSUM_SHA256="40b6639e6a216100d20248ed74fa154202f9ccdfbc335227cedc1bef8ea5d377"
|
||||||
PATCHES="kmymoney-$portVersion.patchset"
|
PATCHES="kmymoney-$portVersion.patchset"
|
||||||
ADDITIONAL_FILES="kmymoney.rdef.in"
|
ADDITIONAL_FILES="kmymoney.rdef.in"
|
||||||
|
|
||||||
@@ -71,6 +71,8 @@ REQUIRES="
|
|||||||
lib:libKF6WidgetsAddons$secondaryArchSuffix
|
lib:libKF6WidgetsAddons$secondaryArchSuffix
|
||||||
lib:libKF6TextWidgets$secondaryArchSuffix
|
lib:libKF6TextWidgets$secondaryArchSuffix
|
||||||
lib:libKF6XmlGui$secondaryArchSuffix
|
lib:libKF6XmlGui$secondaryArchSuffix
|
||||||
|
# Plasma6
|
||||||
|
lib:libPlasmaActivities$secondaryArchSuffix
|
||||||
# Qt6
|
# Qt6
|
||||||
lib:libQt6Core$secondaryArchSuffix
|
lib:libQt6Core$secondaryArchSuffix
|
||||||
lib:libQt6Core5Compat$secondaryArchSuffix
|
lib:libQt6Core5Compat$secondaryArchSuffix
|
||||||
@@ -116,6 +118,7 @@ BUILD_REQUIRES="
|
|||||||
devel:libgmp$secondaryArchSuffix
|
devel:libgmp$secondaryArchSuffix
|
||||||
devel:libical$secondaryArchSuffix
|
devel:libical$secondaryArchSuffix
|
||||||
devel:libKChart6$secondaryArchSuffix
|
devel:libKChart6$secondaryArchSuffix
|
||||||
|
devel:libofx$secondaryArchSuffix
|
||||||
devel:libqt6keychain$secondaryArchSuffix
|
devel:libqt6keychain$secondaryArchSuffix
|
||||||
devel:libsqlcipher$secondaryArchSuffix
|
devel:libsqlcipher$secondaryArchSuffix
|
||||||
# KF6
|
# KF6
|
||||||
@@ -136,6 +139,8 @@ BUILD_REQUIRES="
|
|||||||
devel:libKF6Service$secondaryArchSuffix
|
devel:libKF6Service$secondaryArchSuffix
|
||||||
devel:libKF6TextWidgets$secondaryArchSuffix
|
devel:libKF6TextWidgets$secondaryArchSuffix
|
||||||
devel:libKF6XmlGui$secondaryArchSuffix
|
devel:libKF6XmlGui$secondaryArchSuffix
|
||||||
|
# Plasma6
|
||||||
|
devel:libPlasmaActivities$secondaryArchSuffix
|
||||||
# Qt6
|
# Qt6
|
||||||
devel:libQt6Core$secondaryArchSuffix
|
devel:libQt6Core$secondaryArchSuffix
|
||||||
devel:libQt6Core5Compat$secondaryArchSuffix
|
devel:libQt6Core5Compat$secondaryArchSuffix
|
||||||
@@ -156,20 +161,13 @@ TEST_REQUIRES="
|
|||||||
qthaikuplugins$secondaryArchSuffix
|
qthaikuplugins$secondaryArchSuffix
|
||||||
"
|
"
|
||||||
|
|
||||||
PATCH()
|
|
||||||
{
|
|
||||||
# use Haiku's icon theme
|
|
||||||
sed -e 's,\ KIconTheme::initTheme();,\// KIconTheme::initTheme();,g' -i kmymoney/main.cpp
|
|
||||||
}
|
|
||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||||
$cmakeDirArgs \
|
$cmakeDirArgs \
|
||||||
-DKDE_INSTALL_BINDIR=$appsDir \
|
-DKDE_INSTALL_BINDIR=$appsDir \
|
||||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
|
|
||||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
|
||||||
-DBUILD_WITH_QT6=ON \
|
-DBUILD_WITH_QT6=ON \
|
||||||
|
-DCMAKE_SKIP_RPATH=ON \
|
||||||
-DBUILD_TESTING=OFF \
|
-DBUILD_TESTING=OFF \
|
||||||
-Wno-dev
|
-Wno-dev
|
||||||
|
|
||||||
@@ -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 de03c0ddb7..582a391bfc 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);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
From 5fecd8a30ab7088968173b0e6fd64309d985f072 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Begasus <begasus@gmail.com>
|
|
||||||
Date: Sat, 25 Nov 2023 11:29:01 +0100
|
|
||||||
Subject: Silense deprecated warnings
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 32e2840..c4002c9 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -509,6 +509,12 @@ option(KMM_I18N_GENERATION
|
|
||||||
"Generate i18n messages and documentation (default=ON)" ON)
|
|
||||||
add_feature_info("Internationalization" KMM_I18N_GENERATION "Generation of i18n files (messages and docs)")
|
|
||||||
|
|
||||||
+################# disable deprecated warnings #################
|
|
||||||
+
|
|
||||||
+if (HAIKU)
|
|
||||||
+ add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
######################### The Actual Targets ##########################
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
|
||||||
--
|
|
||||||
2.48.1
|
|
||||||
|
|
||||||
|
|
||||||
From d804270fd4e811416aed5b0a49cea3acb41a7197 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Begasus <begasus@gmail.com>
|
|
||||||
Date: Wed, 6 Aug 2025 16:19:10 +0200
|
|
||||||
Subject: Fix build for Qt < 6.8
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/kmymoney/misc/kmm_codec.cpp b/kmymoney/misc/kmm_codec.cpp
|
|
||||||
index f6695ce..65f9200 100644
|
|
||||||
--- a/kmymoney/misc/kmm_codec.cpp
|
|
||||||
+++ b/kmymoney/misc/kmm_codec.cpp
|
|
||||||
@@ -245,7 +245,7 @@ static QMap<int, QString> mibToName;
|
|
||||||
|
|
||||||
QByteArray KMM_Codec::encodingForLocale()
|
|
||||||
{
|
|
||||||
- QStringDecoder decoder(QLocale::system().name());
|
|
||||||
+ QStringDecoder decoder(QLocale::system().name().toUtf8());
|
|
||||||
if (decoder.isValid()) {
|
|
||||||
const auto name = decoder.name();
|
|
||||||
if (name) {
|
|
||||||
@@ -304,7 +304,7 @@ int KMM_Codec::mibForCodecName(const QString& name)
|
|
||||||
|
|
||||||
static bool hasEncodingForName(const QString& codecName)
|
|
||||||
{
|
|
||||||
- return QStringDecoder(codecName).isValid();
|
|
||||||
+ return QStringDecoder(codecName.toUtf8()).isValid();
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
diff --git a/kmymoney/plugins/csv/import/core/csvimportercore.cpp b/kmymoney/plugins/csv/import/core/csvimportercore.cpp
|
|
||||||
index 27dfd6d..0bd1a22 100644
|
|
||||||
--- a/kmymoney/plugins/csv/import/core/csvimportercore.cpp
|
|
||||||
+++ b/kmymoney/plugins/csv/import/core/csvimportercore.cpp
|
|
||||||
@@ -1840,7 +1840,7 @@ void CSVFile::readFile(CSVProfile *profile)
|
|
||||||
const QString decodedData = inStream.readAll();
|
|
||||||
#else
|
|
||||||
const auto encodedData = inFile.readAll();
|
|
||||||
- QStringDecoder decoder(KMM_Codec::codecNameForMib(profile->m_encodingMIBEnum));
|
|
||||||
+ QStringDecoder decoder(KMM_Codec::codecNameForMib(profile->m_encodingMIBEnum).toUtf8());
|
|
||||||
const QString decodedData = decoder.decode(encodedData);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.48.1
|
|
||||||
|
|
||||||
26
app-office/kmymoney/patches/kmymoney-5.2.2.patchset
Normal file
26
app-office/kmymoney/patches/kmymoney-5.2.2.patchset
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
From c553e1508e950ffb76baa7cb97e9e7043839383d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luc Schrijvers <begasus@gmail.com>
|
||||||
|
Date: Sun, 22 Feb 2026 13:48:33 +0100
|
||||||
|
Subject: Silense deprecated warnings
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 90fd054..f6918e6 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -538,6 +538,12 @@ option(KMM_I18N_GENERATION
|
||||||
|
"Generate i18n messages and documentation (default=ON)" ON)
|
||||||
|
add_feature_info("Internationalization" KMM_I18N_GENERATION "Generation of i18n files (messages and docs)")
|
||||||
|
|
||||||
|
+################# disable deprecated warnings #################
|
||||||
|
+
|
||||||
|
+if (HAIKU)
|
||||||
|
+ add_definitions(-Wno-deprecated-declarations -Wno-pedantic) # TODO too much spam for now
|
||||||
|
+endif()
|
||||||
|
+
|
||||||
|
######################### The Actual Targets ##########################
|
||||||
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||||
|
--
|
||||||
|
2.52.0
|
||||||
|
|
||||||
Reference in New Issue
Block a user