From 11e6b88f0df411d09d423da62d3bb88ca119cf6f Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 2 Jul 2023 16:55:01 +0800
Subject: [PATCH] xpra: drop outdated patch for xf86videodummy

---
 ...ort-for-30-bit-depth-in-dummy-driver.patch | 41 -------------------
 pkgs/tools/X11/xpra/default.nix               |  2 -
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch

diff --git a/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch b/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch
deleted file mode 100644
index 567db3fc3865..000000000000
--- a/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/dummy.h	2016-12-17 23:33:33.279533389 +0100
-+++ b/src/dummy.h	2016-12-17 23:33:56.695739166 +0100
-@@ -69,7 +69,7 @@
-     int overlay_offset;
-     int videoKey;
-     int interlace;
--    dummy_colors colors[256];
-+    dummy_colors colors[1024];
-     pointer* FBBase;
-     Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */
-     Bool prop;
---- a/src/dummy_driver.c	2016-12-17 23:33:47.446657886 +0100
-+++ b/src/dummy_driver.c	2016-12-17 23:33:56.696739175 +0100
-@@ -317,6 +317,7 @@
- 	case 15:
- 	case 16:
- 	case 24:
-+        case 30:
- 	    break;
- 	default:
- 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -331,8 +332,8 @@
- 	pScrn->rgbBits = 8;
- 
-     /* Get the depth24 pixmap format */
--    if (pScrn->depth == 24 && pix24bpp == 0)
--	pix24bpp = xf86GetBppFromDepth(pScrn, 24);
-+    if (pScrn->depth >= 24 && pix24bpp == 0)
-+	pix24bpp = xf86GetBppFromDepth(pScrn, pScrn->depth);
- 
-     /*
-      * This must happen after pScrn->display has been set because
-@@ -623,7 +624,7 @@
-     if(!miCreateDefColormap(pScreen))
- 	return FALSE;
- 
--    if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if (!xf86HandleColormaps(pScreen, 1024, pScrn->rgbBits,
-                          DUMMYLoadPalette, NULL, 
-                          CMAP_PALETTED_TRUECOLOR 
- 			     | CMAP_RELOAD_ON_MODE_SWITCH))
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index f6d2e179b22e..f43196644c7d 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -46,8 +46,6 @@ let
       ./0002-Constant-DPI.patch
       # https://github.com/Xpra-org/xpra/issues/349
       ./0003-fix-pointer-limits.patch
-      # patch provided by Xpra upstream
-      ./0005-support-for-30-bit-depth-in-dummy-driver.patch
     ];
   });