From bf06b29884d51dee8ab41139e6fb8f6902a7707b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 2 Feb 2025 17:01:47 -0800
Subject: [PATCH 1/2] kdePackages.kdialog: add meta.mainProgram

---
 pkgs/kde/gear/kdialog/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/kde/gear/kdialog/default.nix b/pkgs/kde/gear/kdialog/default.nix
index c1f96a49b1e9..53c29b1ce141 100644
--- a/pkgs/kde/gear/kdialog/default.nix
+++ b/pkgs/kde/gear/kdialog/default.nix
@@ -1,4 +1,5 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kdialog";
+  meta.mainProgram = "kdialog";
 }

From 7209001b35a4b021d21f7167094a3115263dd20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 2 Feb 2025 16:53:41 -0800
Subject: [PATCH 2/2] python313Packages.mat2: 0.13.4 -> 0.13.5

Diff: https://0xacab.org/jvoisin/mat2/-/compare/0.13.4...0.13.5

Changelog: https://0xacab.org/jvoisin/mat2/-/blob/0.13.5/CHANGELOG.md
---
 .../python-modules/mat2/default.nix           | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 735c530dc01f..4f781d6109c5 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -3,12 +3,12 @@
   stdenv,
   buildPythonPackage,
   pytestCheckHook,
-  pythonOlder,
   fetchFromGitLab,
   replaceVars,
   bubblewrap,
   exiftool,
   ffmpeg,
+  setuptools,
   wrapGAppsHook3,
   gdk-pixbuf,
   gobject-introspection,
@@ -18,32 +18,29 @@
   pygobject3,
   pycairo,
   dolphinIntegration ? false,
-  plasma5Packages,
+  kdePackages,
 }:
 
 buildPythonPackage rec {
   pname = "mat2";
-  version = "0.13.4";
-
-  disabled = pythonOlder "3.5";
-
-  format = "setuptools";
+  version = "0.13.5";
+  pyproject = true;
 
   src = fetchFromGitLab {
     domain = "0xacab.org";
     owner = "jvoisin";
     repo = "mat2";
-    rev = version;
-    hash = "sha256-SuN62JjSb5O8gInvBH+elqv/Oe7j+xjCo+dmPBU7jEY=";
+    tag = version;
+    hash = "sha256-ivFgH/88DBucZRaO/OMsLlwJCjv/VQXb6AiKWhZ8XH0=";
   };
 
   patches =
     [
       # hardcode paths to some binaries
       (replaceVars ./paths.patch {
-        exiftool = "${exiftool}/bin/exiftool";
-        ffmpeg = "${ffmpeg}/bin/ffmpeg";
-        kdialog = if dolphinIntegration then "${plasma5Packages.kdialog}/bin/kdialog" else null;
+        exiftool = lib.getExe exiftool;
+        ffmpeg = lib.getExe ffmpeg;
+        kdialog = if dolphinIntegration then lib.getExe kdePackages.kdialog else null;
         # replaced in postPatch
         mat2 = null;
         mat2svg = null;
@@ -55,17 +52,18 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       (replaceVars ./bubblewrap-path.patch {
-        bwrap = "${bubblewrap}/bin/bwrap";
+        bwrap = lib.getExe bubblewrap;
       })
     ];
 
   postPatch = ''
-    rm pyproject.toml
     substituteInPlace dolphin/mat2.desktop \
       --replace "@mat2@" "$out/bin/mat2" \
       --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
   '';
 
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3
@@ -77,7 +75,7 @@ buildPythonPackage rec {
     poppler_gi
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mutagen
     pygobject3
     pycairo
@@ -94,11 +92,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # libmat2.pdf.cairo.MemoryError: out of memory
-    "test_all"
-  ];
-
   meta = with lib; {
     description = "Handy tool to trash your metadata";
     homepage = "https://0xacab.org/jvoisin/mat2";