diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e6d10be..4f39cf8 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -30,7 +30,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.8.99.905 -Release: 2%{?gitdate:.%{gitdate}}%{dist} +Release: 3%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -80,7 +80,6 @@ Patch6016: xserver-1.6.1-nouveau.patch # ajax needs to upstream this Patch6027: xserver-1.6.0-displayfd.patch -Patch6028: xserver-1.6.99-randr-error-debugging.patch Patch6030: xserver-1.6.99-right-of.patch Patch6033: xserver-1.6.99-default-modes.patch #Patch6044: xserver-1.6.99-hush-prerelease-warning.patch @@ -550,6 +549,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Aug 02 2010 Adam Jackson 1.8.99.905-3 +- Drop RANDR debugging patch, not useful. + * Wed Jul 21 2010 Adam Tkac 1.8.99.905-2 - include more files in the -source subpkg to make Xvnc compilable diff --git a/xserver-1.6.99-randr-error-debugging.patch b/xserver-1.6.99-randr-error-debugging.patch deleted file mode 100644 index baf99a0..0000000 --- a/xserver-1.6.99-randr-error-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 86b93dc922cda2464e81fa48de1fc2648b1ac4c6 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 27 Jul 2009 16:52:42 -0400 -Subject: [PATCH 09/17] additional randr debugging - ---- - randr/randr.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -diff --git a/randr/randr.c b/randr/randr.c -index f52a46a..a994110 100644 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -480,10 +480,24 @@ RRVerticalRefresh (xRRModeInfo *mode) - static int - ProcRRDispatch (ClientPtr client) - { -+ int ret; - REQUEST(xReq); - if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data]) - return BadRequest; -- return (*ProcRandrVector[stuff->data]) (client); -+ ret = ProcRandrVector[stuff->data](client); -+ -+ if (ret) { -+ int i; -+ ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase); -+ for (i = 0; i < stuff->length; i++) { -+ ErrorF("%08x ", ((unsigned int *)stuff) + i); -+ if ((i+1) % 4 == 0) -+ ErrorF("\n"); -+ } -+ ErrorF("\n"); -+ } -+ -+ return ret; - } - - static int --- -1.7.1 -