From 35d2195c37a47c2f5d8078cbdd7b86df62a247d8 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Tue, 16 Sep 2025 22:43:59 +0800
Subject: [PATCH] Reapply "kdePackages: Plasma 6.3.4 -> 6.3.5"

This reverts commit 54ef2427d2ee237656945a2f89ddcb35508d70ca.
---
 pkgs/kde/plasma/breeze/default.nix           | 14 --------------
 pkgs/kde/plasma/kwin/default.nix             |  8 --------
 pkgs/kde/plasma/plasma-vault/default.nix     |  8 --------
 pkgs/kde/plasma/plasma-workspace/default.nix |  8 --------
 4 files changed, 38 deletions(-)

diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix
index 05f13b663a1f..1e6652164854 100644
--- a/pkgs/kde/plasma/breeze/default.nix
+++ b/pkgs/kde/plasma/breeze/default.nix
@@ -3,24 +3,10 @@
   qtbase,
   qtsvg,
   libsForQt5,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "breeze";
 
-  # Backport fixes for Qt 6.9
-  # FIXME: remove in 6.3.5 / 6.4
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/breeze/-/commit/098ad3facb3d76fe4476424f1b7bf3c9c2c1b142.patch";
-      hash = "sha256-o9XrhYJIvygZ6nfcDKL22jxP7eaHeN3RGBixiOZh9O8=";
-    })
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/breeze/-/commit/e2f16562b64c63b623def44476eadc635a82c7de.patch";
-      hash = "sha256-hPbLEfD3mhPfpoDfVUolUZ4+Pip5VNj8di/0ZDj7Jzw=";
-    })
-  ];
-
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 6b8bd06d5a0e..0d78ac721cf2 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -17,7 +17,6 @@
   pipewire,
   krunner,
   python3,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "kwin";
@@ -30,13 +29,6 @@ mkKdeDerivation {
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
     ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
-
-    # Backport crash fix
-    # FIXME: remove in 6.3.5
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/kwin/-/commit/93bf2f98ae22e654d997c7140b7fe9936fa3f2d3.patch";
-      hash = "sha256-Jaa7IVuYMfxzUv0y2rUo5hdYavjaUkEW9/yteL5katE=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix
index 846e8d568432..f933687143a8 100644
--- a/pkgs/kde/plasma/plasma-vault/default.nix
+++ b/pkgs/kde/plasma/plasma-vault/default.nix
@@ -6,7 +6,6 @@
   fuse,
   cryfs,
   encfs,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "plasma-vault";
@@ -16,13 +15,6 @@ mkKdeDerivation {
     ./0002-cryfs-path.patch
     ./0003-fusermount-path.patch
     ./0004-gocryptfs-path.patch
-
-    # Fix build with Qt 6.9
-    # FIXME: remove in 6.3.5
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/plasma-vault/-/commit/a982e58679caa583ceb4cc883d1c1923dab54db9.patch";
-      hash = "sha256-Khws1fvVTFEgwMDGt7P52PHboa+4kq6g792kFaT5ceU=";
-    })
   ];
 
   CXXFLAGS = [
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index e9e9bbe1b41b..b5a8b5d3657f 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -17,7 +17,6 @@
   qttools,
   qqc2-breeze-style,
   gpsd,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "plasma-workspace";
@@ -33,13 +32,6 @@ mkKdeDerivation {
       # @QtBinariesDir@ only appears in the *removed* lines of the diff
       QtBinariesDir = null;
     })
-
-    # Backport patch recommended by upstream
-    # FIXME: remove in 6.3.5
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/47d502353720004fa2d0e7b0065994b75b3e0ded.patch";
-      hash = "sha256-wt0ZIF4zcEOmP0o4ZcjBYxVjr2hVUlOKVJ8SMNSYt68=";
-    })
   ];
 
   postInstall = ''