From 514602f24e062c82b32ad7ca71a35a6ebb0575fb7473c378a45aa48dde08b0ff Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 15:56:47 +0000 Subject: [PATCH] Accepting request 32619 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 32619 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/32619 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=154 --- ...-swap-the-RandR-PropertyNotify-event.patch | 31 +++++++++++++++++++ xorg-x11-server.changes | 8 +++++ xorg-x11-server.spec | 4 ++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch diff --git a/0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch b/0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch new file mode 100644 index 0000000..0e607ae --- /dev/null +++ b/0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch @@ -0,0 +1,31 @@ +From 8ab141e7080d9955e01b5b442db2a65e4f0d004b Mon Sep 17 00:00:00 2001 +From: Peter Harris +Date: Fri, 12 Feb 2010 09:52:37 -0500 +Subject: [PATCH] Don't double-swap the RandR PropertyNotify event + +The event is already swapped in randr.c/SRROutputPropertyNotifyEvent, so +it should not be swapped here. + +X.Org Bugzilla #26511: http://bugs.freedesktop.org/show_bug.cgi?id=26511 + +Signed-off-by: Peter Harris +--- + randr/rrproperty.c | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +Index: xorg-server-1.7.4/randr/rrproperty.c +=================================================================== +--- xorg-server-1.7.4.orig/randr/rrproperty.c ++++ xorg-server-1.7.4/randr/rrproperty.c +@@ -47,11 +47,6 @@ DeliverPropertyEvent(WindowPtr pWin, voi + + event->sequenceNumber = client->sequence; + event->window = pRREvent->window->drawable.id; +- if (client->swapped) { +- int n; +- swaps(&event->sequenceNumber, n); +- swapl(&event->window, n); +- } + WriteEventsToClient(pRREvent->client, 1, (xEvent *)event); + } + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index f10cc25..a814ffa 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 12 17:18:54 UTC 2010 - lchiquitto@novell.com + +- 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch + * The event is swapped in randr.c/SRROutputPropertyNotifyEvent, + so it should not be swapped again here. + (bnc #573446, bfo #26511) + ------------------------------------------------------------------- Sat Jan 16 19:06:44 CET 2010 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 5483798..9714652 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 65 +Release: 66 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -130,6 +130,7 @@ Patch200: bug534768-prefer_local_symbols.patch Patch202: 0001-Check-harder-for-primary-PCI-device.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Patch204: missing_font_paths.diff +Patch205: 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch %description This package contains the X.Org Server. @@ -262,6 +263,7 @@ popd %patch202 -p1 %patch203 -p1 %patch204 -p0 +%patch205 -p1 %build pushd xorg-docs-*