ChangeLog | 127 +++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2
debian/changelog | 31 ++++++++++
debian/control | 6 +-
debian/patches/1_xi2.1.patch | 4 -
debian/patches/series | 3 -
debian/rules | 11 ++-
man/XGetExtensionVersion.txt | 11 ++-
man/XIChangeHierarchy.txt | 3 -
man/XIChangeProperty.txt | 2
man/XIGrabButton.txt | 2
man/XIGrabEnter.txt | 2
src/XExtInt.c | 2
src/XIHierarchy.c | 3 +
src/XIPassiveGrab.c | 4 -
src/XISelEv.c | 2
16 files changed, 191 insertions(+), 24 deletions(-)
New commits:
commit e2728a953ca72a9ef7ac63a50bb9c5a0972d2a6a
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Jun 14 10:01:28 2011 +0300
Update 1_xi2.1.patch
diff --git a/debian/patches/1_xi2.1.patch b/debian/patches/1_xi2.1.patch
index 0425c1b..70caf4d 100644
--- a/debian/patches/1_xi2.1.patch
+++ b/debian/patches/1_xi2.1.patch
@@ -4,8 +4,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
--AC_INIT([libXi], [1.4.2],
-+AC_INIT([libXi], [1.4.2.99.1],
+-AC_INIT([libXi], [1.4.3],
++AC_INIT([libXi], [1.4.3.99.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
commit 60e06a977ee4f7bb534cda37f6a87e966036c81c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 00:20:31 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 7f416c6..0474e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libxi (2:1.4.3-3) UNRELEASED; urgency=low
+libxi (2:1.4.3-3) unstable; urgency=low
+ * Team upload.
* Don't ship debug symbols for the udeb in libxi6-dbg.
* Add build-{arch,indep} debian/rules targets.
- -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 00:19:18 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 00:20:23 +0200
libxi (2:1.4.3-2) unstable; urgency=low
commit a08b85b3f03906c80573632c7ca7ff33872d7668
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 00:20:22 2011 +0200
Add build-{arch,indep} debian/rules targets.
diff --git a/debian/changelog b/debian/changelog
index fa9b508..7f416c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxi (2:1.4.3-3) UNRELEASED; urgency=low
* Don't ship debug symbols for the udeb in libxi6-dbg.
+ * Add build-{arch,indep} debian/rules targets.
-- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 00:19:18 +0200
diff --git a/debian/rules b/debian/rules
index 1ea2432..d68052a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,11 @@ build/config.status: configure
CFLAGS="$(CFLAGS)"
-build: build-stamp
+build: build-indep build-arch
+build-indep:
+build-arch: build-stamp
+.PHONY: build build-indep build-arch
+
build-stamp: build/config.status
dh_testdir
cd build && $(MAKE)
@@ -105,4 +109,4 @@ binary-indep: build install
# Nothing to do
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install
commit 3e796717c0dffd71824145669e504659adc740eb
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 00:19:36 2011 +0200
Don't ship debug symbols for the udeb in libxi6-dbg.
diff --git a/debian/changelog b/debian/changelog
index 64511cb..fa9b508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.3-3) UNRELEASED; urgency=low
+
+ * Don't ship debug symbols for the udeb in libxi6-dbg.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 00:19:18 +0200
+
libxi (2:1.4.3-2) unstable; urgency=low
* Team upload.
diff --git a/debian/rules b/debian/rules
index 75fb414..1ea2432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,8 @@ binary-arch: build install
dh_installman
dh_installchangelogs ChangeLog
dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs -V'libxi6 (>= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb
commit 3dc1390e099d60a1c09e69ccda9c2b019d178080
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:14:45 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6fcee0c..64511cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxi (2:1.4.3-2) UNRELEASED; urgency=low
+libxi (2:1.4.3-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -6,7 +8,7 @@ libxi (2:1.4.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow from Uploaders.
- -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
+ -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 16:14:32 +0200
libxi (2:1.4.3-1) unstable; urgency=low
commit 730f0432cf1041633244307a31739a84849951f4
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:14:21 2011 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index eddab28..6fcee0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxi (2:1.4.3-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow from Uploaders.
+
-- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
libxi (2:1.4.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 188441f..7c4656c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxi
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
+Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
x11proto-core-dev (>= 7.0.13),
commit 51500559a99e4bf009a55c021e05e3cc75831418
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:11:17 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index fc50ec8..eddab28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.4.3-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
+
libxi (2:1.4.3-1) unstable; urgency=low
* New upstream release.
commit 366472c9dca8b55b1753af49bdeb090a9c4d6304
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 9 12:09:03 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 8958c02..fc50ec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxi (2:1.4.3-1) UNRELEASED; urgency=low
+libxi (2:1.4.3-1) unstable; urgency=low
* New upstream release.
* Add a comment to the series file so that it isn't eaten by
dpkg-source.
* Bump Standards-Version (no changes).
- -- Cyril Brulebois <k...@debian.org> Thu, 09 Jun 2011 11:42:14 +0200
+ -- Cyril Brulebois <k...@debian.org> Thu, 09 Jun 2011 12:08:59 +0200
libxi (2:1.4.2-1) unstable; urgency=low
commit 74ac60d53ceca550e7627701c543d13f230ac218
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 9 12:08:58 2011 +0200
Bump Standards-Version (no changes).
diff --git a/debian/changelog b/debian/changelog
index d167875..8958c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxi (2:1.4.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add a comment to the series file so that it isn't eaten by
dpkg-source.
+ * Bump Standards-Version (no changes).
-- Cyril Brulebois <k...@debian.org> Thu, 09 Jun 2011 11:42:14 +0200
diff --git a/debian/control b/debian/control
index 594a4e0..e3975f9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
xmlto,
xorg-sgml-doctools (>= 1:1.5),
w3m,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git
commit 8b95ccc4d4a82cadb9b07df166ec95837a0af95a
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 9 12:06:51 2011 +0200
Add a comment to the series file so that it isn't eaten by dpkg-source.
diff --git a/debian/changelog b/debian/changelog
index ef9d7e8..d167875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libxi (2:1.4.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add a comment to the series file so that it isn't eaten by
+ dpkg-source.
-- Cyril Brulebois <k...@debian.org> Thu, 09 Jun 2011 11:42:14 +0200
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9bf2d52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder.
commit 35f8b86731d057eb684f9b02ba2e100a5bc30f99
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 9 11:42:27 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3fbb8d8..29c6227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,130 @@
+commit 9fd7b9a9652ecebb8eb533c2a30b9fa7bb186b90
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Jun 7 13:32:11 2011 +1000
+
+ libXi 1.4.3
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 7bdaa3635b7eb4bd993c317922d35cad7ed0cab9
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jun 3 15:10:27 2011 +1000
+
+ man: Fix typo in XIChangeProperty
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f)
+
+commit 63027b24113b349720f1612a4426933c1364ea28
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jun 3 15:02:35 2011 +1000
+
+ man: Fix wrong event names in XIGrabButton.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 597a6a51721d30c4354d1133bb6da6bd2e12446e)
+
+commit 9affea8cfd3f583647e9c6ea2b5debb97e6904c5
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Jun 2 16:21:59 2011 +1000
+
+ Use Data, not Data32 in XIPassiveGrabDevice
+
+ Data32 takes and iterates over an array of longs, thus skipping every 4
+ bytes on LP64. Here we only have arrays of ints, use the normal Data macro
+ instead.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70)
+
+commit 641d1e9943208a8b2c2aef843bd17cb22f833b06
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Jun 2 14:17:44 2011 +1000
+
+ man: fix missing comma in XIGrabEnter man page
+ (cherry picked from commit 67441d30df756eb715a262d3439865dedd4055e8)
+
+commit f37dee93cb288f11d286c7bc4222b2f571ccfd65
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu May 5 09:43:32 2011 +1000
+
+ man: fix typo, layout in XGetExtensionVersion.man
+
+ Fix a typo and move from MPX to XI2. Add a linebreak to make the
+ depreciation separate from the function description. Changes in the second
+ paragraph are just realignment due to the linebreak.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit aa2432240ad02c54280f2d11c007969c3eb9b79f)
+
+commit 89c7eff322c60d78c814693ecb28fa6c65159d3e
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue May 3 14:34:22 2011 +1000
+
+ XIChangeHierarchy: Return Success early if no actual changes are requested.
+
+ Do the same for negative num_changes.
+
+ Found by static analyzer.
+
+ Reported-by: Jeremy Huddleston <jerem...@apple.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit cc6feecae23b321952921cf927bc965386844c8c)
+
+commit 7c6003718458ede0542233a213e05d67731d3e28
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue May 3 13:21:02 2011 +1000
+
+ Allocate enough memory for raw events + extra data.
+
+ Necessary space was calculated, but not actually used to allocate memory.
As
+ a result, valuator data would overwrite the allocated memory.
+
+ ==4166== Invalid write of size 1
+ ==4166== at 0x4C29F04: memcpy (mc_replace_strmem.c:497)
+ ==4166== by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0)
+ ==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
+ ==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
+ ==4166== by 0x49C3E3: process_key (x11_be.c:1065)
+ ==4166== by 0x49EA5C: event_key_release (x11_be.c:2201)
+ ==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
+ ==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
+ ==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
+ ==4166== by 0x87549C9: start_thread (pthread_create.c:300)
+ ==4166== by 0x8A516FC: clone (clone.S:112)
+ ==4166== Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd
+ ==4166== at 0x4C284A8: malloc (vg_replace_malloc.c:236)
+ ==4166== by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0)
+ ==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
+ ==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
+ ==4166== by 0x49C3E3: process_key (x11_be.c:1065)
+ ==4166== by 0x49EA5C: event_key_release (x11_be.c:2201)
+ ==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
+ ==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
+ ==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
+ ==4166== by 0x87549C9: start_thread (pthread_create.c:300)
+
+ Reported-by: Roger Cruz <roger.c...@virtualcomputer.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+ (cherry picked from commit af65475b1f6b7209750220a74aaad9968d54aaf7)
+
+commit 8abdde71b83ff37b8500282e4856c323be508f67
+Author: Matthieu Herrb <matthieu.he...@laas.fr>
+Date: Fri Apr 1 22:49:09 2011 +0200
+
+ Fix XISelectEvents on 64 bits, strict alignement architectures.
+
+ Use Data() to send the struct xXIEventMask on the wire instead of
+ Data32() which expects a pointer to a 64bits value on LP64
+ architectures.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 18177afd4fb3934d0a9083c599fb96701eec2ad9)
+
commit 32236a7779f721d252d633d06ade306f246421a3
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri Mar 18 16:30:13 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index cfb9e80..ef9d7e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 09 Jun 2011 11:42:14 +0200
+
libxi (2:1.4.2-1) unstable; urgency=low
[ Julien Cristau ]
commit 9fd7b9a9652ecebb8eb533c2a30b9fa7bb186b90
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Jun 7 13:32:11 2011 +1000
libXi 1.4.3
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 08501c9..847895a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.4.2],
+AC_INIT([libXi], [1.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
commit 7bdaa3635b7eb4bd993c317922d35cad7ed0cab9
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Jun 3 15:10:27 2011 +1000
man: Fix typo in XIChangeProperty
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f)
diff --git a/man/XIChangeProperty.txt b/man/XIChangeProperty.txt
index 76a0e8b..2e5eea1 100644
--- a/man/XIChangeProperty.txt
+++ b/man/XIChangeProperty.txt
@@ -168,7 +168,7 @@ device. XIChangeProperty performs the following:
- If mode is PropModeReplace, XIChangeProperty discards the previous
property value and stores the new data.
-- If mode is PropModePrepend or PropModeAppend, XChangeProperty
+- If mode is PropModePrepend or PropModeAppend, XIChangeProperty
inserts the specified data before the beginning of the existing
data or onto the end of the existing data, respectively. The type
and format must match the existing property value, or a BadMatch
commit 63027b24113b349720f1612a4426933c1364ea28
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Jun 3 15:02:35 2011 +1000
man: Fix wrong event names in XIGrabButton.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 597a6a51721d30c4354d1133bb6da6bd2e12446e)
diff --git a/man/XIGrabButton.txt b/man/XIGrabButton.txt
index fb806af..4e9bcb9 100644
--- a/man/XIGrabButton.txt
+++ b/man/XIGrabButton.txt
@@ -107,7 +107,7 @@ DESCRIPTION
device is the device specified with deviceid. In the future,
the device is actively grabbed (as for XIGrabDevice, the
last-grab time is set to the time at which the button or keycode
- was pressed and the X_XIButtonPress or X_XIKeyPress event is
+ was pressed and the XI_ButtonPress or XI_KeyPress event is
reported if all of the following conditions are true:
* The device is not grabbed, and the specified button or
keycode is logically pressed when the specified modifier
commit 9affea8cfd3f583647e9c6ea2b5debb97e6904c5
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jun 2 16:21:59 2011 +1000
Use Data, not Data32 in XIPassiveGrabDevice
Data32 takes and iterates over an array of longs, thus skipping every 4
bytes on LP64. Here we only have arrays of ints, use the normal Data macro
instead.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
(cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70)
diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c
index feef74b..34f1bf3 100644
--- a/src/XIPassiveGrab.c
+++ b/src/XIPassiveGrab.c
@@ -67,9 +67,9 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int
grabtype, int detail,
buff = calloc(4, req->mask_len);
memcpy(buff, mask->mask, mask->mask_len);
- Data32(dpy, buff, req->mask_len * 4);
+ Data(dpy, buff, req->mask_len * 4);
for (i = 0; i < num_modifiers; i++)
- Data32(dpy, &modifiers_inout[i].modifiers, 4);
+ Data(dpy, (char*)&modifiers_inout[i].modifiers, 4);
free(buff);
commit 641d1e9943208a8b2c2aef843bd17cb22f833b06
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jun 2 14:17:44 2011 +1000
man: fix missing comma in XIGrabEnter man page
(cherry picked from commit 67441d30df756eb715a262d3439865dedd4055e8)
diff --git a/man/XIGrabEnter.txt b/man/XIGrabEnter.txt
index fff3773..f75a5ad 100644
--- a/man/XIGrabEnter.txt
+++ b/man/XIGrabEnter.txt
@@ -14,7 +14,7 @@ SYNOPSIS
int XIGrabEnter( Display *display,
int deviceid,
- Window grab_window
+ Window grab_window,
Cursor cursor,
int grab_mode,
int paired_device_mode,
commit f37dee93cb288f11d286c7bc4222b2f571ccfd65
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu May 5 09:43:32 2011 +1000
man: fix typo, layout in XGetExtensionVersion.man
Fix a typo and move from MPX to XI2. Add a linebreak to make the
depreciation separate from the function description. Changes in the second
paragraph are just realignment due to the linebreak.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit aa2432240ad02c54280f2d11c007969c3eb9b79f)
diff --git a/man/XGetExtensionVersion.txt b/man/XGetExtensionVersion.txt
index 3e24fc7..c7d45f4 100644
--- a/man/XGetExtensionVersion.txt
+++ b/man/XGetExtensionVersion.txt
@@ -25,11 +25,12 @@ DESCRIPTION
-----------
The XGetExtensionVersion request is deprecated and should not
- be used. Clients issuing a XgetExtensionVersion request will
- not be able to use MPX features. The XGetExtensionVersion
- request queries the version of the input extension, and returns
- an XExtensionVersion structure. This structure contains a
- major_version and minor_version number which can be compared
+ be used in XI2 applications. Clients issuing a XGetExtensionVersion
+ request will not be able to use XI2 features.
+
+ The XGetExtensionVersion request queries the version of the input
+ extension, and returns an XExtensionVersion structure. This structure
+ contains a major_version and minor_version number which can be compared
with constants defined in XI.h. Support for additional protocol
requests added to the input extension after its initial release
is indicated by a version number corresponding to the added
commit 89c7eff322c60d78c814693ecb28fa6c65159d3e
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue May 3 14:34:22 2011 +1000
XIChangeHierarchy: Return Success early if no actual changes are requested.
Do the same for negative num_changes.
Found by static analyzer.
Reported-by: Jeremy Huddleston <jerem...@apple.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
(cherry picked from commit cc6feecae23b321952921cf927bc965386844c8c)
diff --git a/man/XIChangeHierarchy.txt b/man/XIChangeHierarchy.txt
index ac667bc..205f40f 100644
--- a/man/XIChangeHierarchy.txt
+++ b/man/XIChangeHierarchy.txt
@@ -30,7 +30,8 @@ DESCRIPTION
XIChangeHierarchy modifies the device hierarchy by creating or
removing master devices or changing the attachment of slave
devices. If num_changes is non-zero, changes is an array of
- XIAnyHierarchyChangeInfo structures.
+ XIAnyHierarchyChangeInfo structures. If num_changes is equal or less than
+ zero, XIChangeHierarchy does nothing.
XIChangeHierarchy processes changes in order, effective
immediately. If an error occurs, processing is aborted and the
diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c
index d30ea29..09e6f93 100644
--- a/src/XIHierarchy.c
+++ b/src/XIHierarchy.c
@@ -52,6 +52,9 @@ XIChangeHierarchy(Display* dpy,
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
return (NoSuchExtension);
+ if (num_changes <= 0)
+ return Success;
+
GetReq(XIChangeHierarchy, req);
req->reqType = info->codes->major_opcode;
req->ReqType = X_XIChangeHierarchy;
commit 7c6003718458ede0542233a213e05d67731d3e28
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue May 3 13:21:02 2011 +1000
Allocate enough memory for raw events + extra data.
Necessary space was calculated, but not actually used to allocate memory. As
a result, valuator data would overwrite the allocated memory.
==4166== Invalid write of size 1
==4166== at 0x4C29F04: memcpy (mc_replace_strmem.c:497)
==4166== by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0)
==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
==4166== by 0x49C3E3: process_key (x11_be.c:1065)
==4166== by 0x49EA5C: event_key_release (x11_be.c:2201)
==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
==4166== by 0x87549C9: start_thread (pthread_create.c:300)
==4166== by 0x8A516FC: clone (clone.S:112)
==4166== Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd
==4166== at 0x4C284A8: malloc (vg_replace_malloc.c:236)
==4166== by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0)
==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
==4166== by 0x49C3E3: process_key (x11_be.c:1065)
==4166== by 0x49EA5C: event_key_release (x11_be.c:2201)
==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
==4166== by 0x87549C9: start_thread (pthread_create.c:300)
Reported-by: Roger Cruz <roger.c...@virtualcomputer.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
Reviewed-by: Daniel Stone <dan...@fooishbar.org>
(cherry picked from commit af65475b1f6b7209750220a74aaad9968d54aaf7)
diff --git a/src/XExtInt.c b/src/XExtInt.c
index d1451cc..134ccc6 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1259,7 +1259,7 @@ copyRawEvent(XGenericEventCookie *cookie_in,
len = sizeof(XIRawEvent) + in->valuators.mask_len;
len += bits * sizeof(double) * 2;
- ptr = cookie_out->data = malloc(sizeof(XIRawEvent));
+ ptr = cookie_out->data = malloc(len);
if (!ptr)
return False;
commit 8abdde71b83ff37b8500282e4856c323be508f67
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Fri Apr 1 22:49:09 2011 +0200
Fix XISelectEvents on 64 bits, strict alignement architectures.
Use Data() to send the struct xXIEventMask on the wire instead of
Data32() which expects a pointer to a 64bits value on LP64
architectures.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 18177afd4fb3934d0a9083c599fb96701eec2ad9)
diff --git a/src/XISelEv.c b/src/XISelEv.c
index a9c997a..3192b6b 100644
--- a/src/XISelEv.c
+++ b/src/XISelEv.c
@@ -83,7 +83,7 @@ XISelectEvents(Display* dpy, Window win, XIEventMask* masks,
int num_masks)
* and they need to be padded with 0 */
buff = calloc(1, mask.mask_len * 4);
memcpy(buff, current->mask, current->mask_len);
- Data32(dpy, &mask, sizeof(xXIEventMask));
+ Data(dpy, (char*)&mask, sizeof(xXIEventMask));
Data(dpy, buff, mask.mask_len * 4);
free(buff);
}
commit f694397c0bfca9fcd6f5b1a53756d3bc97c7e78f
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Wed Mar 23 01:26:41 2011 -0700
fix up install path for udeb under multiarch
diff --git a/debian/libxi6-udeb.install b/debian/libxi6-udeb.install
index 32abb0e..8ec79b8 100644
--- a/debian/libxi6-udeb.install
+++ b/debian/libxi6-udeb.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6* usr/lib
commit f2ffc8ec2ef6896f0e741dc486d2ae079c1effa0
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Wed Mar 23 00:24:38 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index 594a4e0..cb515ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
x11proto-core-dev (>= 7.0.13),
x11proto-xext-dev (>= 7.0.3),
x11proto-input-dev (>= 1.9.99.902),
@@ -29,6 +29,8 @@ Package: libxi6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support
+Multi-Arch: same
Description: X11 Input extension library
libXi provides an X Window System client interface to the XINPUT
extension to the X protocol.
@@ -56,6 +58,7 @@ Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version})
+Multi-Arch: same
Description: X11 Input extension library (debug package)
libXi provides an X Window System client interface to the XINPUT
extension to the X protocol.
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 1ddc544..dd8b3e3 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libXi.a
-usr/lib/libXi.so
-usr/lib/pkgconfig/xi.pc
+usr/lib/*/libXi.a
+usr/lib/*/libXi.so
+usr/lib/*/pkgconfig/xi.pc
usr/include/X11/extensions/
usr/share/doc/libXi/specs/*.html usr/share/doc/libxi-dev
usr/share/doc/libXi/specs/*.txt usr/share/doc/libxi-dev
diff --git a/debian/libxi6.install b/debian/libxi6.install
index 32abb0e..afccc4c 100644
--- a/debian/libxi6.install
+++ b/debian/libxi6.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6*
diff --git a/debian/rules b/debian/rules
index 7956d93..75fb414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -42,6 +43,7 @@ build/config.status: configure
--infodir=\$${prefix}/share/info $(confflags) \
--with-xmlto \
--without-fop \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qwngk-0005lp...@vasks.debian.org
