[Xcb] xproto test failed

[Antoine Latter]

On Mon, Feb 16, 2009 at 4:41 AM, Julien Danjou <julien at danjou.info> wrote:
> Hi,
>
> Current git version of xcb-proto fails to pass xmllint:
>
> ./xcb.xsd:58: element extension: Schemas parser error : Element
> '{http://www.w3.org/2001/XMLSchema}complexType': The content is not
> valid. Expected is (annotation?, (simpleContent | complexContent |
> ((group | all | choice | sequence)?, ((attribute | attributeGroup)*,
> anyAttribute?)))).
>
> The culprit is commit 12a2b2bf7492d292c9f8e2b2abb3be1dc3e98ab1:
> --- a/src/xcb.xsd
> +++ b/src/xcb.xsd
> @@ -53,7 +53,19 @@ authorization from the authors.
>   </xsd:complexType>
>
>   <!-- field replaces FIELD, PARAM, and REPLY. -->
> -  <xsd:element name="field" type="var" />
> +  <xsd:element name="field">
> +    <xsd:complexType>
> +      <xsd:extension base="var">
> +       <!-- Used for fields which are bitmasks. Refers to the type which
> +            describes the mask. -->
> +       <xsd:attribute name="mask" type="xsd:string" use="optional" />
> +
> +       <!-- Used for fields which are enums.  Refers to the type which
> +            describes the enumeration. -->
> +       <xsd:attribute name="enum" type="xsd:string" use="optional" />
> +      </xsd:extension>
> +    </xsd:complexType>
> +  </xsd:element>
>
>   <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
>        are specified as attributes.  The content is an expression giving the
>
> I'm a XML newbie so I can't fix it myself.
> Help?
>
> Cheers,
> --
> Julien Danjou
> // ** <julien at danjou.info>   http://julien.danjou.info
> // 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD
> // Ferns will rule the world.
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
>
> iEYEARECAAYFAkmZQt8ACgkQpGK1HsL+5c1kbACgo9OzgnVgNe+X5qMNRdH5eRn9
> HQ0AmQFlJrqKiOneidCIntZXZivflqJ/
> =cbBm
> -----END PGP SIGNATURE-----
>
>

xmllint passes with this patch, rest of distcheck also appears okay.

Antoine
-------------- next part --------------
From a0b4844f0f96ed4473cdf86b9991cfd3e5372f62 Mon Sep 17 00:00:00 2001
From: Antoine Latter <aslatter at gmail.com>
Date: Mon, 16 Feb 2009 08:25:07 -0600
Subject: [PATCH] xmllint should pass

---
 src/xcb.xsd |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/xcb.xsd b/src/xcb.xsd
index f84d194..a60017d 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -55,15 +55,17 @@ authorization from the authors.
   <!-- field replaces FIELD, PARAM, and REPLY. -->
   <xsd:element name="field">
     <xsd:complexType>
-      <xsd:extension base="var">
-	<!-- Used for fields which are bitmasks. Refers to the type which
-	     describes the mask. -->
-	<xsd:attribute name="mask" type="xsd:string" use="optional" />
-
-	<!-- Used for fields which are enums.  Refers to the type which
-	     describes the enumeration. -->
-	<xsd:attribute name="enum" type="xsd:string" use="optional" />
-      </xsd:extension>
+      <xsd:complexContent>
+	<xsd:extension base="var">
+	  <!-- Used for fields which are bitmasks. Refers to the type which
+	       describes the mask. -->
+	  <xsd:attribute name="mask" type="xsd:string" use="optional" />
+	  
+	  <!-- Used for fields which are enums.  Refers to the type which
+	       describes the enumeration. -->
+	  <xsd:attribute name="enum" type="xsd:string" use="optional" />
+	</xsd:extension>
+      </xsd:complexContent>
     </xsd:complexType>
   </xsd:element>
 
-- 
1.5.6.3