From b7582dc2d7c55f7fa0c2eecba812c361355a6c5e Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 2 May 2026 10:47:52 +0000
Subject: [PATCH] xpra: 6.3.6 -> 6.4.3

---
 pkgs/by-name/xp/xpra/fix-122159.patch | 6 ++----
 pkgs/by-name/xp/xpra/fix-41106.patch  | 8 +++-----
 pkgs/by-name/xp/xpra/package.nix      | 6 +++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/xp/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch
index 58efa07e790d..ae1b27e2bda5 100644
--- a/pkgs/by-name/xp/xpra/fix-122159.patch
+++ b/pkgs/by-name/xp/xpra/fix-122159.patch
@@ -1,10 +1,8 @@
-diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
-index 7806612e05..4c7a0ec2dd 100755
 --- a/xpra/scripts/main.py
 +++ b/xpra/scripts/main.py
-@@ -444,13 +444,7 @@ def run_mode(script_file: str, cmdline, error_cb, options, args, full_mode: str,
-             "seamless", "desktop", "shadow", "shadow-screen", "expand",
+@@ -536,13 +536,7 @@
              "upgrade", "upgrade-seamless", "upgrade-desktop",
+             "encoder", "runner",
      ) and not display_is_remote and options.daemon and use_systemd_run(options.systemd_run):
 -        # make sure we run via the same interpreter,
 -        # inject it into the command line if we have to:
diff --git a/pkgs/by-name/xp/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch
index 84061106323c..170b107be43d 100644
--- a/pkgs/by-name/xp/xpra/fix-41106.patch
+++ b/pkgs/by-name/xp/xpra/fix-41106.patch
@@ -1,8 +1,6 @@
-diff --git a/xpra/server/util.py b/xpra/server/util.py
-index 401a9fb959..678e2ce745 100644
---- a/xpra/server/util.py
-+++ b/xpra/server/util.py
-@@ -175,6 +175,10 @@ def xpra_env_shell_script(socket_dir: str, env: dict[str, str]) -> str:
+--- a/xpra/server/runner_script.py
++++ b/xpra/server/runner_script.py
+@@ -74,6 +74,10 @@
  
  
  def xpra_runner_shell_script(xpra_file: str, starting_dir: str) -> str:
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 2faaa600a575..98b92893c2cf 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -104,14 +104,14 @@ let
 in
 effectiveBuildPythonApplication rec {
   pname = "xpra";
-  version = "6.3.6";
+  version = "6.4.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Xpra-org";
     repo = "xpra";
     tag = "v${version}";
-    hash = "sha256-kXe/Pyjzf6CxYtsYP15hgYnj+qricrlXGqi/G3uQMFM=";
+    hash = "sha256-TmhMjO1WTF4fT/G0EyRzORI/Q/cd3IipQn0eRwkWYRE=";
   };
 
   patches = [
@@ -135,6 +135,7 @@ effectiveBuildPythonApplication rec {
 
   nativeBuildInputs = [
     clang
+    cython
     gobject-introspection
     pkg-config
     wrapGAppsHook3
@@ -168,7 +169,6 @@ effectiveBuildPythonApplication rec {
   ++ [
     atk.out
     cairo
-    cython
     ffmpeg
     gdk-pixbuf
     glib