From 5e1d980f8d6848d3f141713a8796c34c3266a680 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 8 Oct 2024 18:06:19 +0300
Subject: [PATCH] qt6: backport fixes for weird list behaviors from 6.8.1

Recommended by Plasma upstream.
---
 pkgs/development/libraries/qt-6/default.nix          |  7 +++++++
 .../libraries/qt-6/modules/qtdeclarative.nix         | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 51bd83a99d19..1ee93acfe485 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -62,6 +62,13 @@ let
             revert = true;
             hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
           })
+
+          # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
+          # FIXME: remove for 6.8.1
+          (fetchpatch2 {
+            url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch";
+            hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI=";
+          })
         ];
       };
       env = callPackage ./qt-env.nix { };
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
index 2a377d481c3c..1472aff537df 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
@@ -6,6 +6,7 @@
 , stdenv
 , lib
 , pkgsBuildBuild
+, fetchpatch2
 }:
 
 qtModule {
@@ -19,6 +20,17 @@ qtModule {
     ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
     # add version specific QML import path
     ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
+
+    # Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116
+    # FIXME: remove for 6.8.1
+    (fetchpatch2 {
+      url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch";
+      hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch";
+      hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c=";
+    })
   ];
 
   cmakeFlags = [