rpms/xorg-x11-server/devel xserver-1.3.0-composite-version.patch, NONE, 1.1 xorg-x11-server.spec, 1.238, 1.239

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10848

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-composite-version.patch 
Log Message:
* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-14
- xserver-1.3.0-composite-version.patch: Force the server to report the
  Composite extension version it supports, not simply the version defined
  by the protocol headers it was built against.


xserver-1.3.0-composite-version.patch:

--- NEW FILE xserver-1.3.0-composite-version.patch ---
diff -up xorg-server-1.3.0.0/composite/compext.c.jx xorg-server-1.3.0.0/composite/compext.c
--- xorg-server-1.3.0.0/composite/compext.c.jx	2007-07-12 09:30:39.000000000 -0400
+++ xorg-server-1.3.0.0/composite/compext.c	2007-07-12 09:33:45.000000000 -0400
@@ -49,6 +49,9 @@
 
 #include "compint.h"
 
+#define SERVER_COMPOSITE_MAJOR 0
+#define SERVER_COMPOSITE_MINOR 3
+
 static CARD8	CompositeReqCode;
 int		CompositeClientPrivateIndex;
 RESTYPE		CompositeClientWindowType;
@@ -133,16 +136,16 @@ ProcCompositeQueryVersion (ClientPtr cli
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    if (stuff->majorVersion < COMPOSITE_MAJOR) {
+    if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) {
 	rep.majorVersion = stuff->majorVersion;
 	rep.minorVersion = stuff->minorVersion;
     } else {
-	rep.majorVersion = COMPOSITE_MAJOR;
-	if (stuff->majorVersion == COMPOSITE_MAJOR && 
-	    stuff->minorVersion < COMPOSITE_MINOR)
+	rep.majorVersion = SERVER_COMPOSITE_MAJOR;
+	if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR && 
+	    stuff->minorVersion < SERVER_COMPOSITE_MINOR)
 	    rep.minorVersion = stuff->minorVersion;
 	else
-	    rep.minorVersion = COMPOSITE_MINOR;
+	    rep.minorVersion = SERVER_COMPOSITE_MINOR;
     }
     pCompositeClient->major_version = rep.majorVersion;
     pCompositeClient->minor_version = rep.minorVersion;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- xorg-x11-server.spec	2 Jul 2007 15:17:53 -0000	1.238
+++ xorg-x11-server.spec	12 Jul 2007 13:56:57 -0000	1.239
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -55,6 +55,7 @@
 Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
 Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
+Patch1011:  xserver-1.3.0-composite-version.patch
 
 Patch2001:  xserver-1.2.0-geode-mmx.patch
 Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
@@ -310,6 +311,7 @@
 %patch1008 -p1 -b .comment-less
 %patch1009 -p1 -b .maxpixclock
 %patch1010 -p1 -b .prerelease-warning
+%patch1010 -p1 -b .composite-version
 
 %patch2001 -p1 -b .geode-mmx
 %patch2002 -p1 -b .xephyr-keysym
@@ -596,6 +598,11 @@
 
 
 %changelog
+* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-14
+- xserver-1.3.0-composite-version.patch: Force the server to report the
+  Composite extension version it supports, not simply the version defined
+  by the protocol headers it was built against.
+
 * Mon Jul 02 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-13
 - Add IDLETIME sync counter for great powersaving justice.
 - Conditionalise default font path for F7 spec compatibility.