diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-17 17:20:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-17 17:20:18 +0200 |
commit | be0f4240cc38faaef3f5fcdcdf2456a0a834cdd3 (patch) | |
tree | 2ef2328e0d037d4cf8d452ab1b9da984d34020f7 /pkgs | |
parent | ce48633addd04db8bccded4a6c21ed5cec08b563 (diff) | |
parent | bbe6e6da9b3d6259f185ae1ccaa9b8ab4fee3f01 (diff) |
Merge pull request #221664 from wegank/kitsas-bump
kitsas: 3.2.1 -> 4.0.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/kitsas/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/office/kitsas/qt-512.patch | 24 |
2 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index bcac1b916fa27..3fd6dd82db90c 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "kitsas"; - version = "3.2.1"; + version = "4.0.3"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - sha256 = "sha256-1gp6CMoDTAp6ORnuk5wos67zygmE9s2pXwvwcR+Hwgg="; + hash = "sha256-7s21++sA4enZFuDVUEAbn7InpyLx6BOwrFdsUzHWK0M="; }; - # QList::swapItemsAt was introduced in Qt 5.13 - patches = lib.optional (lib.versionOlder qtbase.version "5.13") ./qt-512.patch; + postPatch = '' + substituteInPlace kitsas/kitsas.pro \ + --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5" + ''; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; @@ -26,10 +28,10 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv kitsas.app $out/Applications - '' else '' + '' + lib.optionalString (!stdenv.isDarwin) '' install -Dm755 kitsas -t $out/bin install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps diff --git a/pkgs/applications/office/kitsas/qt-512.patch b/pkgs/applications/office/kitsas/qt-512.patch deleted file mode 100644 index b225b933104cf..0000000000000 --- a/pkgs/applications/office/kitsas/qt-512.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git i/kitsas/apuri/siirtoapuri.cpp w/kitsas/apuri/siirtoapuri.cpp -index 9a2c51f3..9565200f 100644 ---- i/kitsas/apuri/siirtoapuri.cpp -+++ w/kitsas/apuri/siirtoapuri.cpp -@@ -25,6 +25,7 @@ - #include "db/tositetyyppimodel.h" - #include "tiliote/tiliotekirjaaja.h" - -+#include <QtAlgorithms> - #include <QDebug> - - SiirtoApuri::SiirtoApuri(QWidget *parent, Tosite *tosite) : -@@ -361,8 +362,9 @@ void SiirtoApuri::laskunmaksu() - TositeVienti eka = lista.at(0).toMap(); - tosite()->asetaPvm(eka.pvm()); - tosite()->asetaOtsikko( eka.selite() ); -- if( eka.kreditEuro() ) -- lista.swapItemsAt(0,1); -+ if( eka.kreditEuro() ) { -+ qSwap(lista.begin()[0], lista.begin()[1]); -+ } - tosite()->viennit()->asetaViennit(lista); - reset(); - |