kitsas: 5.9 -> 5.11.1, modernize (#473836)
This commit is contained in:
@@ -1,23 +0,0 @@
|
||||
diff --git a/kitsas/kirjaus/kirjauswg.cpp b/kitsas/kirjaus/kirjauswg.cpp
|
||||
--- a/kitsas/kirjaus/kirjauswg.cpp
|
||||
+++ b/kitsas/kirjaus/kirjauswg.cpp
|
||||
@@ -499,7 +499,7 @@ void KirjausWg::paivita(bool muokattu, int virheet, const Euro &debet, const Eu
|
||||
} else if( virheet & Tosite::EITASMAAPVM) {
|
||||
ui->varoTeksti->setText( tr("Debet ja kredit eivät täsmää jokaisella päivämäärällä."));
|
||||
} else if( debet ) {
|
||||
- ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet,0,'f',2) );
|
||||
+ ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet.toDouble(),0,'f',2) );
|
||||
}
|
||||
|
||||
|
||||
diff --git a/kitsas/selaus/tositeselausmodel.cpp b/kitsas/selaus/tositeselausmodel.cpp
|
||||
--- a/kitsas/selaus/tositeselausmodel.cpp
|
||||
+++ b/kitsas/selaus/tositeselausmodel.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <QSqlQuery>
|
||||
|
||||
#include <QDebug>
|
||||
+#include <QJsonValue>
|
||||
#include <QSqlError>
|
||||
|
||||
#include "db/yhteysmodel.h"
|
||||
@@ -2,28 +2,23 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
poppler,
|
||||
libzip,
|
||||
pkg-config,
|
||||
poppler,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kitsas";
|
||||
version = "5.9";
|
||||
version = "5.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artoh";
|
||||
repo = "kitupiikki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZU6b7Yl/dE0vk8UfyEVXtpt4ANnuKInvJ/RZYbIZj+Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix Qt 6.10 compatibility: QString::arg() no longer accepts Euro type directly
|
||||
./fix-qt610-euro-arg.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qt6.qmake
|
||||
@@ -62,11 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/artoh/kitupiikki";
|
||||
changelog = "https://github.com/artoh/kitupiikki/releases/tag/v${finalAttrs.version}";
|
||||
description = "Accounting tool suitable for Finnish associations and small business";
|
||||
homepage = "https://github.com/artoh/kitupiikki";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "kitsas";
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user