kmymoney, revbump, build fix for Qt < 6.8 (#12691)

This commit is contained in:
Schrijvers Luc
2025-08-06 20:14:09 +02:00
committed by GitHub
parent e121703bb9
commit ad5bb92c05
2 changed files with 47 additions and 2 deletions

View File

@@ -5,7 +5,7 @@ their personal finances by providing a broad array of financial features and too
HOMEPAGE="https://kmymoney.org/"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.kde.org/stable/kmymoney/$portVersion/kmymoney-$portVersion.tar.xz"
CHECKSUM_SHA256="feadf40b6d4c90d77e32716a858dd23769081863104d8cea62910b1ec3e4336b"
PATCHES="kmymoney-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From 0515dcd454eca9c6adcf44aaca8d5e0ab993a579 Mon Sep 17 00:00:00 2001
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
@@ -24,3 +24,48 @@ index 32e2840..c4002c9 100644
--
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