From 6c2df6415e61504e335afcc758a2cc6a71afafc7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 5 Feb 2025 23:12:17 +0300
Subject: [PATCH] qt6: backport patches recommended by KDE folks

---
 .../libraries/qt-6/modules/qtbase/default.nix     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 0c7ee34a8d83..e5ae77bd522c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -82,6 +82,7 @@
   libGLSupported ? stdenv.hostPlatform.isLinux,
   libGL,
   qttranslations ? null,
+  fetchpatch,
 }:
 
 let
@@ -226,6 +227,20 @@ stdenv.mkDerivation rec {
     ./qmlimportscanner-import-path.patch
     # don't pass qtbase's QML directory to qmlimportscanner if it's empty
     ./skip-missing-qml-directory.patch
+
+    # FIXME: 6.8.3 backports recommended by KDE
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtbase/-/commit/12d4bf1ab52748cb84894f50d437064b439e0b7d.patch";
+      hash = "sha256-HBwmQyAyaJh+in50Kd+mMa/6t+GZC3UmQWSe7Ugvn2Y=";
+    })
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtbase/-/commit/2ef615228bba9a8eb282437bfb7472f925610e89.patch";
+      hash = "sha256-pkKA7o7er9n5mu8EfJsjs8NeEq/SlKpEoRZwsDor1+c=";
+    })
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtbase/-/commit/a43c7e58046604796aa69974ea1c5d3e2648c755.patch";
+      hash = "sha256-4KJn7RTpSi8IFUElt3LEoMsuJmkYSf+bp2/Jmf42Ygs=";
+    })
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''