From c3521015a703351c0a6eb92a4600ae1fa43283a8 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Tue, 8 Oct 2024 18:09:27 +0200
Subject: [PATCH] kitsas: 4.0.5 -> 5.7

---
 pkgs/applications/office/kitsas/default.nix | 24 +++++++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix
index 9821cdd2f2f869a..f8124286a3d8844 100644
--- a/pkgs/applications/office/kitsas/default.nix
+++ b/pkgs/applications/office/kitsas/default.nix
@@ -1,24 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, qmake
+, qtsvg
+, qtwebengine
+, qt5compat
+, poppler
+, libzip
+, pkg-config
+, wrapQtAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "kitsas";
-  version = "4.0.5";
+  version = "5.7";
 
   src = fetchFromGitHub {
     owner = "artoh";
     repo = "kitupiikki";
     rev = "v${version}";
-    hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg=";
+    hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k=";
   };
 
-  postPatch = ''
-    substituteInPlace kitsas/kitsas.pro \
-      --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5"
-  '';
-
   nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
 
-  buildInputs = [ qtsvg poppler libzip ];
+  buildInputs = [ qtsvg poppler qtwebengine qt5compat libzip ];
 
   # We use a separate build-dir as otherwise ld seems to get confused between
   # directory and executable name on buildPhase.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 787f20384e3c91d..b1bf816a3250f95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30492,7 +30492,7 @@ with pkgs;
 
   kile = callPackage ../applications/editors/kile { };
 
-  kitsas = libsForQt5.callPackage ../applications/office/kitsas { };
+  kitsas = qt6Packages.callPackage ../applications/office/kitsas { };
 
   kiwitalk = callPackage ../by-name/ki/kiwitalk/package.nix { pnpm = pnpm_8; };