fix merge botch
This commit is contained in:
matthieu
parent
3fe16e8b60
commit
f71ecdef37
@ -82,24 +82,3 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Copyright © 2009 Red Hat, Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice (including the next
|
||||
paragraph) shall be included in all copies or substantial portions of the
|
||||
Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
@ -177,185 +177,6 @@ Date: Tue Oct 27 15:07:25 2009 -0400
|
||||
future changes.
|
||||
(cherry picked from commit 847b72d9de8dd839c391321b50312368e63e7305)
|
||||
|
||||
commit 8e44e907f5715705c1c69e7ee79615dbd0aa24ab
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Aug 4 07:58:15 2010 +1000
|
||||
|
||||
libXi 1.3.2
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 24da86e6a0a0f6753f943c998f53b225f5d24b02
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Aug 2 15:35:46 2010 +1000
|
||||
|
||||
Fix broken cherry-pick for doctools check.
|
||||
|
||||
Cherry-pick d7d8a9e4fc37ab0f865e74ea1871617a3b542906 conflict resolve was
|
||||
broken. Test was inverted, reports "not found" when found and the other way
|
||||
round.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
||||
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
|
||||
Tested-by: Gaetan Nadon <gaetan.nadon@videotron.ca>
|
||||
|
||||
commit 41c7b9513342c10c2a5ad17fa2cde7c2aa91042b
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Aug 2 09:58:16 2010 +1000
|
||||
|
||||
libXi 1.3.1
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit b764411d074f0379810b7e921473504b539cfdf3
|
||||
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
Date: Fri Jun 18 11:32:36 2010 +0300
|
||||
|
||||
Always unlock display correctly
|
||||
|
||||
XISelectEvents and XIGetSelectedEvents were not unlocking display in all
|
||||
return paths.
|
||||
|
||||
Reported-by: Julien Cristau <jcristau@debian.org>
|
||||
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
(cherry picked from commit 8daf961d0fe6a1433c8248d984618a7e22ff88b8)
|
||||
|
||||
commit e116a06d5964e51623d68c329119be87d3ce8ab0
|
||||
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
Date: Mon Jun 14 10:05:36 2010 +0300
|
||||
|
||||
Fix memory leak in XIGetSelectedEvents
|
||||
|
||||
mask_in was leaking for every successfull XIGetSelectedEvents.
|
||||
|
||||
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||
(cherry picked from commit b953bf7b9775e5970776a21ae3f7919592289c92)
|
||||
|
||||
commit e2a82e587b528e2d1b352ee89d9f0b4ad5450f0a
|
||||
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
Date: Fri Jun 11 17:30:44 2010 +0300
|
||||
|
||||
Fix usage of uninitialized value
|
||||
|
||||
In error case length of extra data could be uninitialized. This would
|
||||
result randomly sized request later in function.
|
||||
|
||||
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
|
||||
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||
(cherry picked from commit 6199f89992e2b6ba5f96833f4f4087b61ca61ac5)
|
||||
|
||||
commit 9ab5ba3eabc58f5154b25f4f1de631c2fdaec3ce
|
||||
Author: Jamey Sharp <jamey@minilop.net>
|
||||
Date: Fri Apr 9 17:31:00 2010 -0700
|
||||
|
||||
Don't unlock the Display twice.
|
||||
|
||||
_xiQueryVersion's caller must wrap it in a LockDisplay/UnlockDisplay
|
||||
pair, so it shouldn't call UnlockDisplay itself.
|
||||
|
||||
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
||||
(cherry picked from commit 54fbe5759aa961dccc618b35573845f847675570)
|
||||
|
||||
commit 87b6e5822532f63b63dc926cbf6788726b83812d
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Dec 9 13:59:57 2009 +1000
|
||||
|
||||
Initialize extension with the right number of events.
|
||||
|
||||
If the server supports a lower XI version than the client, the Xlib-internal
|
||||
event vector may be smashed. See libXext for more details.
|
||||
http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287
|
||||
|
||||
This patch queries the server for the supported XI extension before
|
||||
registering the extension with Xlib. The number of events registered depends
|
||||
on the server version.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||
(cherry picked from commit 299de21b2ab3cfa2078823215f84da67e7b3d1a3)
|
||||
|
||||
commit 7b3e496d17b85fd2ec245194376628263ce31cab
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu Feb 18 16:52:12 2010 +1000
|
||||
|
||||
man: fix types for XGetSelectedExtensionEvents.
|
||||
|
||||
The return values are of type XEventClass** and int*, respectively.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
|
||||
(cherry picked from commit d7e421f97db74332783ae885f6835f84133c92b5)
|
||||
|
||||
commit d7d8a9e4fc37ab0f865e74ea1871617a3b542906
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Aug 2 10:03:56 2010 +1000
|
||||
|
||||
Need both xmlto and asciidoc to install man pages from a checkout
|
||||
|
||||
The check for whether to build the pages looked for both xmlto and
|
||||
asciidoc, but the check to install didn't. Refactor a bit so that the
|
||||
check is done only once.
|
||||
|
||||
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
|
||||
Tested-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Tested-by: Christian Hartmann <cornogle@googlemail.com>
|
||||
(cherry picked from commit b75b8fa4bda0fb18872fa82a04fe7f609a147f8b)
|
||||
|
||||
Conflicts:
|
||||
|
||||
configure.ac
|
||||
|
||||
commit 4e42d40e282e0977d8df882c49e1602740d3d79f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sat Jan 23 10:04:38 2010 -0500
|
||||
|
||||
man: allow installing prebuilt man pages from tarball
|
||||
|
||||
The man pages source may be supplied in the tarball or built
|
||||
from git. The makefile needs to take that into consideration
|
||||
and adjust the targets accordingly.
|
||||
|
||||
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
(cherry picked from commit c183e15263787af913bf8eb7be707e0f2e974824)
|
||||
|
||||
commit 08775f43d3dc288ff2ce5eda5adad24ee2ccad84
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Jan 14 09:22:08 2010 -0500
|
||||
|
||||
COPYING: add missing copyright notice
|
||||
|
||||
Refer to: XiAllowEvents.c
|
||||
Copyright © 2009 Red Hat, Inc.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
(cherry picked from commit bb07265cfbd919de4903dadbfe42d1779c20225c)
|
||||
|
||||
commit c6f447477a0a8d2d6fcea24b5850f25f11ec7c9b
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:10 2009 -0400
|
||||
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||
README may have been updated
|
||||
Remove AUTHORS file as it is empty and no content available yet.
|
||||
Remove NEWS file as it is empty and no content available yet.
|
||||
(cherry picked from commit d157e3b4ac31710fb1d4d62f1cc4fa743ec61522)
|
||||
|
||||
commit 456ee0853b03ea9ec34d390eb39247e1c06d89e9
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Oct 27 15:07:25 2009 -0400
|
||||
|
||||
Deploy the new XORG_DEFAULT_OPTIONS #24242
|
||||
|
||||
This macro aggregate a number of existing macros that sets commmon
|
||||
X.Org components configuration options. It shields the configuration file from
|
||||
future changes.
|
||||
(cherry picked from commit 847b72d9de8dd839c391321b50312368e63e7305)
|
||||
|
||||
commit 63621888d6e36a2f9e41e81c14728d70beeff5ee
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Oct 2 12:09:17 2009 +1000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user