From d0cb1cb0aa1659b440288c6cad68ec85b9ee1c84 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 29 Mar 2025 13:52:17 +0000
Subject: [PATCH] xfce.xfce4-session: 4.20.0 -> 4.20.2

https://gitlab.xfce.org/xfce/xfce4-session/-/compare/xfce4-session-4.20.0...xfce4-session-4.20.2
---
 .../xfce/core/xfce4-session/default.nix       | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
index 79d131723e6f..a79b8793dd56 100644
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -1,5 +1,6 @@
 { lib
 , mkXfceDerivation
+, fetchpatch
 , polkit
 , exo
 , libxfce4util
@@ -17,9 +18,25 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-session";
-  version = "4.20.0";
+  version = "4.20.2";
 
-  sha256 = "sha256-mn3ky1NzrpQZRkhc605mj+GFhbFq26eW59YKUfnX9X8=";
+  sha256 = "sha256-wd+8W9Z0dH7bqILBUNG9YxpRf8TnRJ/7b3QviM1HVnY=";
+
+  patches = [
+    # Use syntax compatible with most sh shells
+    # The `**` syntax is a bash extension
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/53d6e20a29948ae7aa179447cef0704786b77f8b.patch";
+      hash = "sha256-c8IU1VOcEYdZJy8Eq2wqSL5tTXt7gKfGOs7jxb8npOE=";
+    })
+
+    # wayland: start a D-Bus session only if there isn't one already
+    # https://gitlab.xfce.org/xfce/xfce4-session/-/issues/218
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/f6e2805b8a7742172f399d78618313bcb28bf095.patch";
+      hash = "sha256-EViVialDbdLH2SGUtcroo5iGc+B4HVJajV7PMl5q6vs=";
+    })
+  ];
 
   buildInputs = [
     exo