cfbe5d4947
Upstream merge request: https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/254 Resolves: https://issues.redhat.com/browse/RHEL-40132
35 lines
993 B
Diff
35 lines
993 B
Diff
From 5dfedaf4aa1a032ea6cb4e871abd2e065f798129 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Thu, 6 Jun 2024 16:25:26 +0200
|
|
Subject: [PATCH 1/3] Revert "Fix XTS regression in XCopyColormapAndFree"
|
|
|
|
This change was to fix the next change that we are to revert as well.
|
|
|
|
This reverts commit 68c72a7341b114277ab232f2499ee3bd035af8a0.
|
|
|
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/254>
|
|
---
|
|
src/CopyCmap.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/src/CopyCmap.c b/src/CopyCmap.c
|
|
index b37aba73..b4954b01 100644
|
|
--- a/src/CopyCmap.c
|
|
+++ b/src/CopyCmap.c
|
|
@@ -53,11 +53,6 @@ Colormap XCopyColormapAndFree(
|
|
mid = req->mid = XAllocID(dpy);
|
|
req->srcCmap = src_cmap;
|
|
|
|
- /* re-lock the display to keep XID handling in sync */
|
|
- UnlockDisplay(dpy);
|
|
- SyncHandle();
|
|
- LockDisplay(dpy);
|
|
-
|
|
#if XCMS
|
|
_XcmsCopyCmapRecAndFree(dpy, src_cmap, mid);
|
|
#endif
|
|
--
|
|
2.45.2
|
|
|