From ba4baedc0198230b63cb1ac63236f0e179934937 Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Wed, 23 Aug 2023 13:48:54 +0200
Subject: [PATCH 1/3] fontmatrix: 0.6.0-qt5 -> 0.6.0

Diff: https://github.com/fcoiffie/fontmatrix/compare/1ff8382d8c85c18d9962918f461341ff4fe21993...v0.6.0
---
 pkgs/applications/graphics/fontmatrix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 3c67b11844d0..1b0121a16c95 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -2,7 +2,7 @@
 
 mkDerivation rec {
   pname = "fontmatrix";
-  version = "0.6.0-qt5";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "fcoiffie";

From a7941173c8964c576957f4935d058aeacc958fe8 Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Wed, 23 Aug 2023 17:40:05 +0200
Subject: [PATCH 2/3] Switch from fork to original repo

---
 .../graphics/fontmatrix/default.nix           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 1b0121a16c95..f42ae0be249a 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,22 +1,22 @@
-{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qttools
+, qtwebkit
+}:
 
 mkDerivation rec {
   pname = "fontmatrix";
-  version = "0.6.0";
+  version = "0.9.100";
 
   src = fetchFromGitHub {
-    owner = "fcoiffie";
+    owner = "fontmatrix";
     repo = "fontmatrix";
-    rev = "1ff8382d8c85c18d9962918f461341ff4fe21993";
-    sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h";
+    rev = "v${version}";
+    sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88=";
   };
 
-  # Add missing QAction include
-  patches = [ (fetchpatch {
-    url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch";
-    sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8";
-  })];
-
   buildInputs = [ qttools qtwebkit ];
 
   nativeBuildInputs = [ cmake ];

From 156005fef48652c4f0c4e159977b3603637afc3e Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Wed, 23 Aug 2023 21:44:16 +0200
Subject: [PATCH 3/3] Remove hardeningDisable attribute

---
 pkgs/applications/graphics/fontmatrix/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index f42ae0be249a..6945c3ac3ae4 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -21,8 +21,6 @@ mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  hardeningDisable = [ "format" ];
-
   meta = with lib; {
     description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
     homepage = "https://github.com/fontmatrix/fontmatrix";