diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-03-22 16:17:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 16:17:01 -0500 |
| commit | 4e8a59a06213fb9e71feb728a5892baf6aed5959 (patch) | |
| tree | 52526ab32ae3052edaeeab6deecb264ba5fb5b20 /var | |
| parent | 7c82db07ac077ead4c9edcc97b51237629e4c397 (diff) | |
| download | spack-4e8a59a06213fb9e71feb728a5892baf6aed5959.tar.gz spack-4e8a59a06213fb9e71feb728a5892baf6aed5959.tar.bz2 spack-4e8a59a06213fb9e71feb728a5892baf6aed5959.tar.xz spack-4e8a59a06213fb9e71feb728a5892baf6aed5959.zip | |
Add patch to fix xcb-proto make check (#3520)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/xcb-proto/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xcb-proto/xcb-proto-1.12-schema-1.patch | 52 |
2 files changed, 53 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index be8a09ef62..546375c7fc 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -37,4 +37,4 @@ class XcbProto(AutotoolsPackage): extends('python') - # NOTE: `make check` fails xmllint validation + patch('xcb-proto-1.12-schema-1.patch', when='@1.12') diff --git a/var/spack/repos/builtin/packages/xcb-proto/xcb-proto-1.12-schema-1.patch b/var/spack/repos/builtin/packages/xcb-proto/xcb-proto-1.12-schema-1.patch new file mode 100644 index 0000000000..2a0b69255c --- /dev/null +++ b/var/spack/repos/builtin/packages/xcb-proto/xcb-proto-1.12-schema-1.patch @@ -0,0 +1,52 @@ +Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org> +Date: 2016-06-01 +Initial Package Version: 1.12 +Upstream Status: Not Committed +Origin: https://lists.freedesktop.org/archives/xcb/2016-February/010676.html +Description: Fixes make check + + +--- a/src/xcb.xsd ++++ b/src/xcb.xsd +@@ -44,6 +44,15 @@ authorization from the authors. + <xsd:complexType> + <xsd:attribute name="bytes" type="xsd:integer" use="optional" /> + <xsd:attribute name="align" type="xsd:integer" use="optional" /> ++ <xsd:attribute name="serialize" type="xsd:boolean" use="optional" /> ++ </xsd:complexType> ++ </xsd:element> ++ ++ <!-- Alignment --> ++ <xsd:element name="required_start_align" > ++ <xsd:complexType> ++ <xsd:attribute name="align" type="xsd:integer" use="required" /> ++ <xsd:attribute name="offset" type="xsd:integer" use="optional" /> + </xsd:complexType> + </xsd:element> + +@@ -76,14 +85,13 @@ authorization from the authors. + <xsd:sequence> + <!-- switch(expression) --> + <xsd:group ref="expression" minOccurs="1" maxOccurs="1" /> ++ <xsd:element ref="required_start_align" minOccurs="0" maxOccurs="1" /> + <xsd:choice> + <!-- bitcase expression - bit test --> + <xsd:element name="bitcase" type="caseexpr" minOccurs="0" maxOccurs="unbounded" /> + <!-- case expression - value test --> + <xsd:element name="case" type="caseexpr" minOccurs="0" maxOccurs="unbounded" /> + </xsd:choice> +- <!-- default: --> +- <xsd:group ref="fields" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> +@@ -201,6 +209,7 @@ authorization from the authors. + <xsd:element ref="field" /> + <xsd:element ref="list" /> + <xsd:element ref="fd" /> ++ <xsd:element ref="required_start_align" /> + </xsd:choice> + </xsd:group> + + + |