Accepting request 32986 from X11:XOrg

checked in (request 32986)

OBS-URL: https://build.opensuse.org/request/show/32986
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=225

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 <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);
+     }
+ 

xorg-server-1.7.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+size 4919597

xorg-server-1.7.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
-size 4926990

xorg-x11-server.changes

@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Sat Feb 20 08:35:14 CET 2010 - sndirsch@suse.de
-
-- update to 1.7.5
-  * Only four fixes since the RC, with the fix for 25640 being
-    rather noteworthy - if your X server crashed on replugging
-    keyboards (or using a KVM), you're encouraged to upgrade.
-    - dix: restore lastDeviceEventTime update in dixSaveScreens
-    - Don't double-swap the RandR PropertyNotify event
-    - Xi: reset the sli pointers after copying device classes.
-      (bfo #25640)
-    - RENDER: Fix gradient and solid fill pictures with Xinerama,
-      and misc cleanup
-- obsoletes 
-  0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch 
-
 -------------------------------------------------------------------
 Fri Feb 12 17:18:54 UTC 2010 - lchiquitto@novell.com
 

xorg-x11-server.spec

@@ -20,7 +20,7 @@
 %define moblin 0
 
 Name:           xorg-x11-server
-%define dirsuffix 1.7.5
+%define dirsuffix 1.7.4
 %define fglrx_driver_hack 0
 ### FIXME
 %define vnc 1
@@ -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-*