pool/xorg-x11-server
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 32619 from X11:XOrg

Browse Source 
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
This commit is contained in:
OBS User autobuild 2010-02-18 15:56:47 +00:00 committed by Git OBS Bridge
parent 6c7e20d56d
commit 514602f24e
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch Normal file
View File

@ -0,0 +1,31 @@
From 8ab141e7080d9955e01b5b442db2a65e4f0d004b Mon Sep 17 00:00:00 2001
From: Peter Harris <pharris@opentext.com>
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 <pharris@opentext.com>
---
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);
}

8
xorg-x11-server.changes
View File

@ -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 Sat Jan 16 19:06:44 CET 2010 - sndirsch@suse.de

4
xorg-x11-server.spec
View File

@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 65 Release: 66
License: GPLv2+ ; MIT License (or similar) License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 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 Patch202: 0001-Check-harder-for-primary-PCI-device.patch
Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
Patch204: missing_font_paths.diff Patch204: missing_font_paths.diff
Patch205: 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -262,6 +263,7 @@ popd
%patch202 -p1 %patch202 -p1
%patch203 -p1 %patch203 -p1
%patch204 -p0 %patch204 -p0
%patch205 -p1
%build %build
pushd xorg-docs-* pushd xorg-docs-*