Hello community, here is the log from the commit of package xcb-proto for openSUSE:Factory checked in at 2014-08-07 08:08:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-proto (Old) and /work/SRC/openSUSE:Factory/.xcb-proto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcb-proto" Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-proto/xcb-proto.changes 2014-05-05 21:11:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcb-proto.new/xcb-proto.changes 2014-08-07 08:08:16.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 5 23:04:04 UTC 2014 - [email protected] + +- Update to version 1.11 (7.6_1.11): + Minor bug fixes and things that libxcb 1.11 will need. + +------------------------------------------------------------------- Old: ---- xcb-proto-1.10.1.tar.bz2 New: ---- xcb-proto-1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-proto.spec ++++++ --- /var/tmp/diff_new_pack.pk0YB4/_old 2014-08-07 08:08:17.000000000 +0200 +++ /var/tmp/diff_new_pack.pk0YB4/_new 2014-08-07 08:08:17.000000000 +0200 @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define dirsuffix 1.10.1 + +%define dirsuffix 1.11 Name: xcb-proto Version: 7.6_%{dirsuffix} +Release: 0 BuildRequires: pkg-config BuildRequires: python-base BuildRequires: autoconf >= 2.60 BuildRequires: automake -BuildRequires: libtool BuildRequires: fdupes +BuildRequires: libtool Url: http://xorg.freedesktop.org/ -Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The X Protocol License: X11 @@ -81,7 +82,6 @@ %fdupes -s $RPM_BUILD_ROOT/usr/%{_lib}/python2.6/site-packages/xcbgen/ %endif - %files -n %{name}-devel %defattr(-,root,root) %dir /usr/share/xcb ++++++ xcb-proto-1.10.1.tar.bz2 -> xcb-proto-1.11.tar.bz2 ++++++ ++++ 7952 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/.gitignore new/xcb-proto-1.11/.gitignore --- old/xcb-proto-1.10.1/.gitignore 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -aclocal.m4 -autom4te.cache -compile -depcomp -install-sh -libtool -ltmain.sh -missing -mkinstalldirs -py-compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -configure.lineno -.deps -.dirstamp -.libs -*.lo -*.loT -*.la -Makefile -Makefile.in -stamp-h1 -*.o -*.pc -*.tar.bz2 -*.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/HACKING new/xcb-proto-1.11/HACKING --- old/xcb-proto-1.10.1/HACKING 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/HACKING 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -Make patches more descriptive -============================= - -By default hunk headers of a patch will look like this: - - @@ -1227,6 +1227,8 @@ authorization from the authors. - -Which is not very usefull as it doesn't give a hint where the change -happened (except for the line number). To make those hunk headers more -descriptive, i.e.: - - @@ -1227,6 +1227,8 @@ <struct name="HierarchyChange"> - -Add these 2 lines to your .git/config file: - - [diff "xcb"] - xfuncname = "(<\\b(xcb|enum|event|request|struct|union)\\b.*>)" - -For more background on this magic have a look at src/.gitattributes and -the man page gitattributes(5) chapter "Defining a custom hunk-header". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/NEWS new/xcb-proto-1.11/NEWS --- old/xcb-proto-1.10.1/NEWS 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/NEWS 2014-08-01 15:40:42.000000000 +0200 @@ -1,3 +1,17 @@ +Release 1.11 (2014-08-01) +========================= +* Add support for <pad align="n" /> +* xkb: Fix padding bug in GetMap +* xcbgen: Track directly included modules +* xprint: Fix PrintGetAttributes reply +* xkb: Fix use of nKTLevels +* xv: Fix padding in struct AdaptorInfo +* xproto: Fix EnterNotify documentation +* Update the protocol schema +* xinput: Add missing pad in DeviceResolutionCtl +* xinput: Add missing pad in XIChangeHierarchy +* xinput: Add missing modLatches as comment in LatchLockState + Release 1.10 (2013-12-22) ========================= * xkb: comment out portions that libxcb doesn't handle properly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/configure.ac new/xcb-proto-1.11/configure.ac --- old/xcb-proto-1.10.1/configure.ac 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/configure.ac 2014-08-01 15:43:01.000000000 +0200 @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.10, + 1.11, [[email protected]]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/doc/xml-xcb.txt new/xcb-proto-1.11/doc/xml-xcb.txt --- old/xcb-proto-1.10.1/doc/xml-xcb.txt 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/doc/xml-xcb.txt 2014-07-30 12:59:39.000000000 +0200 @@ -201,6 +201,14 @@ declares the data type of the field, and the name attribute gives the name of the field. +<fd name="identifier" /> + + This element represents a file descriptor field passed with the request. The + name attribute gives the name of the field. + + While ordinary fields are encoded as part of the request, file descriptor + fields are generally passed via an out-of-band mechanism. + <list type="identifier" name="identifier">expression</list> This element represents an array or list of fields in a data structure. The diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/missing new/xcb-proto-1.11/missing --- old/xcb-proto-1.10.1/missing 1970-01-01 01:00:00.000000000 +0100 +++ new/xcb-proto-1.11/missing 2014-08-01 15:44:01.000000000 +0200 @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to <[email protected]>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/py-compile new/xcb-proto-1.11/py-compile --- old/xcb-proto-1.10.1/py-compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xcb-proto-1.11/py-compile 2014-08-01 15:44:02.000000000 +0200 @@ -0,0 +1,170 @@ +#!/bin/sh +# py-compile - Compile a Python program + +scriptversion=2011-06-08.12; # UTC + +# Copyright (C) 2000-2013 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +if [ -z "$PYTHON" ]; then + PYTHON=python +fi + +me=py-compile + +usage_error () +{ + echo "$me: $*" >&2 + echo "Try '$me --help' for more information." >&2 + exit 1 +} + +basedir= +destdir= +while test $# -ne 0; do + case "$1" in + --basedir) + if test $# -lt 2; then + usage_error "option '--basedir' requires an argument" + else + basedir=$2 + fi + shift + ;; + --destdir) + if test $# -lt 2; then + usage_error "option '--destdir' requires an argument" + else + destdir=$2 + fi + shift + ;; + -h|--help) + cat <<\EOF +Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." + +Byte compile some python scripts FILES. Use --destdir to specify any +leading directory path to the FILES that you don't want to include in the +byte compiled file. Specify --basedir for any additional path information you +do want to be shown in the byte compiled file. + +Example: + py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v|--version) + echo "$me $scriptversion" + exit $? + ;; + --) + shift + break + ;; + -*) + usage_error "unrecognized option '$1'" + ;; + *) + break + ;; + esac + shift +done + +files=$* +if test -z "$files"; then + usage_error "no files given" +fi + +# if basedir was given, then it should be prepended to filenames before +# byte compilation. +if [ -z "$basedir" ]; then + pathtrans="path = file" +else + pathtrans="path = os.path.join('$basedir', file)" +fi + +# if destdir was given, then it needs to be prepended to the filename to +# byte compile but not go into the compiled file. +if [ -z "$destdir" ]; then + filetrans="filepath = path" +else + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" +fi + +$PYTHON -c " +import sys, os, py_compile, imp + +files = '''$files''' + +sys.stdout.write('Byte-compiling python modules...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) + else: + py_compile.compile(filepath, filepath + 'c', path) +sys.stdout.write('\n')" || exit $? + +# this will fail for python < 1.5, but that doesn't matter ... +$PYTHON -O -c " +import sys, os, py_compile, imp + +# pypy does not use .pyo optimization +if hasattr(sys, 'pypy_translation_info'): + sys.exit(0) + +files = '''$files''' +sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + else: + py_compile.compile(filepath, filepath + 'o', path) +sys.stdout.write('\n')" 2>/dev/null || : + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/.gitattributes new/xcb-proto-1.11/src/.gitattributes --- old/xcb-proto-1.10.1/src/.gitattributes 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/.gitattributes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -*.xml diff=xcb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/dri2.xml new/xcb-proto-1.11/src/dri2.xml --- old/xcb-proto-1.10.1/src/dri2.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/dri2.xml 2014-07-20 17:48:22.000000000 +0200 @@ -98,7 +98,7 @@ <op op="&"> <op op="+"> <fieldref>driver_name_length</fieldref> - <value> 3 </value> + <value>3</value> </op> <unop op="~"> <value>3</value> @@ -133,7 +133,10 @@ <request name="GetBuffers" opcode="5"> <field type="DRAWABLE" name="drawable" /> <field type="CARD32" name="count" /> - <list type="CARD32" name="attachments" /> + <list type="CARD32" name="attachments"> + <!-- The length field should be linked but we can't correct it without breaking API --> + <!-- <fieldref>count</fieldref> --> + </list> <reply> <pad bytes="1" /> <field type="CARD32" name="width" /> @@ -159,7 +162,10 @@ <request name="GetBuffersWithFormat" opcode="7"> <field type="DRAWABLE" name="drawable" /> <field type="CARD32" name="count" /> - <list type="AttachFormat" name="attachments" /> + <list type="AttachFormat" name="attachments"> + <!-- The length field should be linked but we can't correct it without breaking API --> + <!-- <fieldref>count</fieldref> --> + </list> <reply> <pad bytes="1" /> <field type="CARD32" name="width" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xcb.xsd new/xcb-proto-1.11/src/xcb.xsd --- old/xcb-proto-1.10.1/src/xcb.xsd 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xcb.xsd 2014-07-30 12:59:39.000000000 +0200 @@ -91,7 +91,11 @@ <xsd:element name="field" type="var" /> <!-- fd passing parameter --> - <xsd:element name="fd" /> + <xsd:element name="fd"> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </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 @@ -158,8 +162,8 @@ <xsd:attribute name="ref" use="required" type="xsd:string" /> </xsd:complexType> </xsd:element> - <xsd:element name="value" type="dec-or-hex-integer" /> - <xsd:element name="bit" type="xsd:integer" /> + <xsd:element name="value" type="xsd:integer" /> + <xsd:element name="bit" type="bitType" /> </xsd:choice> </xsd:group> @@ -220,18 +224,14 @@ <xsd:attribute name="ref" type="xsd:string" use="required" /> </xsd:complexType> - <!-- Type for hex integers --> - <xsd:simpleType name="hex-integer"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="0x[0-9a-fA-F]+" /> + <!-- Type for bit values --> + <xsd:simpleType name="bitType"> + <xsd:restriction base="xsd:integer"> + <xsd:minInclusive value="0" /> + <xsd:maxExclusive value="32" /> </xsd:restriction> </xsd:simpleType> - <!-- Type for integers in either decimal or hex --> - <xsd:simpleType name="dec-or-hex-integer"> - <xsd:union memberTypes="xsd:integer hex-integer" /> - </xsd:simpleType> - <!-- Type for documentation --> <xsd:group name="doc-fields"> <xsd:sequence> @@ -317,7 +317,7 @@ <xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="opcode" type="xsd:integer" use="required" /> <xsd:attribute name="combine-adjacent" type="xsd:boolean" - use="optional"/> + use="optional" default="false" /> </xsd:complexType> </xsd:element> <xsd:element name="event"> @@ -328,8 +328,9 @@ <xsd:element ref="doc" minOccurs="0" maxOccurs="1" /> </xsd:sequence> <xsd:attribute name="no-sequence-number" type="xsd:boolean" - use="optional" /> - <xsd:attribute name="xge" type="xsd:boolean" use="optional" /> + use="optional" default="false" /> + <xsd:attribute name="xge" type="xsd:boolean" + use="optional" default="false" /> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -359,8 +360,8 @@ <xsd:element name="item"> <xsd:complexType> <xsd:choice minOccurs="1" maxOccurs="1"> - <xsd:element name="value" type="dec-or-hex-integer" /> - <xsd:element name="bit" type="xsd:integer" /> + <xsd:element name="value" type="xsd:unsignedInt" /> + <xsd:element name="bit" type="bitType" /> </xsd:choice> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xf86vidmode.xml new/xcb-proto-1.11/src/xf86vidmode.xml --- old/xcb-proto-1.10.1/src/xf86vidmode.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xf86vidmode.xml 2014-04-10 16:26:42.000000000 +0200 @@ -159,7 +159,7 @@ <op op="&"> <op op="+"> <fieldref>vendor_length</fieldref> - <value> 3 </value> + <value>3</value> </op> <unop op="~"> <value>3</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xinput.xml new/xcb-proto-1.11/src/xinput.xml --- old/xcb-proto-1.10.1/src/xinput.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xinput.xml 2014-07-30 12:59:39.000000000 +0200 @@ -914,6 +914,7 @@ <field type="CARD16" name="len" /> <field type="CARD8" name="first_valuator" /> <field type="CARD8" name="num_valuators" /> + <pad bytes="2" /> <list type="CARD32" name="resolution_values"> <fieldref>num_valuators</fieldref> </list> @@ -1000,7 +1001,7 @@ <!-- ChangeDeviceProperty --> <enum name="PropertyFormat"> - <item name="8Bits"> <value> 8</value> </item> + <item name="8Bits"> <value>8</value> </item> <item name="16Bits"> <value>16</value> </item> <item name="32Bits"> <value>32</value> </item> </enum> @@ -1229,6 +1230,7 @@ <request name="XIChangeHierarchy" opcode="43"> <field type="CARD8" name="num_changes" /> + <pad bytes="3" /> <list type="HierarchyChange" name="changes"> <fieldref>num_changes</fieldref> </list> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xkb.xml new/xcb-proto-1.11/src/xkb.xml --- old/xcb-proto-1.10.1/src/xkb.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xkb.xml 2014-07-30 12:59:39.000000000 +0200 @@ -1204,6 +1204,10 @@ <field name="lockGroup" type="BOOL" /> <field name="groupLock" type="CARD8" enum="Group" /> <field name="affectModLatches" type="CARD8" mask="ModMask" /> + <pad bytes="1" /> <!-- This pad is a workaround to prevent an API break, + which the following field (correct fix) would cause. + <field name="modLatches" type="CARD8" mask="ModMask" /> + --> <pad bytes="1" /> <field name="latchGroup" type="BOOL" /> <field name="groupLatch" type="CARD16" /> @@ -1778,7 +1782,7 @@ <bitcase> <enumref ref="NameDetail">KTLevelNames</enumref> <list name="nLevelsPerType" type="CARD8"> - <fieldref>nKTLevels</fieldref> + <fieldref>nTypes</fieldref> </list> <list name="ktLevelNames" type="ATOM"> <sumof ref="nLevelsPerType" /> @@ -2220,7 +2224,7 @@ <bitcase> <enumref ref="NameDetail">KTLevelNames</enumref> <list name="nLevelsPerType" type="CARD8"> - <fieldref>nKTLevels</fieldref> + <fieldref>nTypes</fieldref> </list> <list name="ktLevelNames" type="ATOM"> <sumof ref="nLevelsPerType" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xprint.xml new/xcb-proto-1.11/src/xprint.xml --- old/xcb-proto-1.10.1/src/xprint.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xprint.xml 2014-07-20 17:48:22.000000000 +0200 @@ -235,7 +235,9 @@ <pad bytes="1" /> <field type="CARD32" name="stringLen" /> <pad bytes="20" /> - <field type="STRING8" name="attributes" /> + <list type="STRING8" name="attributes"> + <fieldref>stringLen</fieldref> + </list> </reply> </request> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xproto.xml new/xcb-proto-1.11/src/xproto.xml --- old/xcb-proto-1.10.1/src/xproto.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xproto.xml 2014-07-30 12:59:39.000000000 +0200 @@ -506,11 +506,11 @@ <doc> <brief>the pointer is in a different window</brief> <field name="event"><![CDATA[ -The reconfigured window or its parent, depending on whether `StructureNotify` -or `SubstructureNotify` was selected. +The window on which the event was generated. ]]></field> - <field name="window"><![CDATA[ -The window that was unmapped. + <field name="child"><![CDATA[ +If the `event` window has subwindows and the final pointer position is in one +of them, then `child` is set to that subwindow, `XCB_WINDOW_NONE` otherwise. ]]></field> <field name="root"><![CDATA[ The root window for the final cursor position. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.10.1/src/xv.xml new/xcb-proto-1.11/src/xv.xml --- old/xcb-proto-1.10.1/src/xv.xml 2014-02-19 21:35:16.000000000 +0100 +++ new/xcb-proto-1.11/src/xv.xml 2014-07-20 17:48:22.000000000 +0200 @@ -101,6 +101,7 @@ <list type="char" name="name"> <fieldref>name_size</fieldref> </list> + <pad align="4" /> <list type="Format" name="formats"> <fieldref>num_formats</fieldref> </list> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
