libxi: Changes to 'debian-unstable'
ChangeLog | 41 +++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 9 +++++++++
debian/control | 10 +++-------
src/XChDProp.c | 6 +++---
src/XExtInt.c | 16 ++++++++--------
6 files changed, 65 insertions(+), 19 deletions(-)
New commits:
commit 89023ebe9594af9a0908534d053bc9681ad7dd74
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 24 14:15:34 2016 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index dd5ea0f..1709d14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxi (2:1.7.6-1) UNRELEASED; urgency=medium
+libxi (2:1.7.6-1) unstable; urgency=medium
* New upstream release.
* Remove Drew and Cyril from Uploaders.
* Fix package descriptions: input hotplugging has been implemented years ago
(closes: #782987). Thanks, Paul Wise!
- -- Julien Cristau <jcristau@debian.org> Sun, 24 Jan 2016 13:59:40 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 24 Jan 2016 14:15:17 +0100
libxi (2:1.7.5-1) unstable; urgency=medium
commit 011c0b75ee909cf7c5faa2fa9ce63188b46de0e6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 24 14:12:34 2016 +0100
Fix package descriptions: input hotplugging has been implemented years ago (closes: #782987).
Thanks, Paul Wise!
diff --git a/debian/changelog b/debian/changelog
index 284b2c9..dd5ea0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxi (2:1.7.6-1) UNRELEASED; urgency=medium
* New upstream release.
* Remove Drew and Cyril from Uploaders.
+ * Fix package descriptions: input hotplugging has been implemented years ago
+ (closes: #782987). Thanks, Paul Wise!
-- Julien Cristau <jcristau@debian.org> Sun, 24 Jan 2016 13:59:40 +0100
diff --git a/debian/control b/debian/control
index a0a311c..aa5f529 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,7 @@ Description: X11 Input extension library
extension to the X protocol.
.
The Input extension allows setup and configuration of multiple input devices,
- and will soon allow hotplugging of input devices; to be added and removed on
- the fly.
+ and hotplugging of input devices (to be added and removed on the fly).
.
More information about X.Org can be found at:
<URL:http://www.X.org>
@@ -68,8 +67,7 @@ Description: X11 Input extension library (debug package)
extension to the X protocol.
.
The Input extension allows setup and configuration of multiple input devices,
- and will soon allow hotplugging of input devices; to be added and removed on
- the fly.
+ and hotplugging of input devices (to be added and removed on the fly).
.
This package contains the debug versions of the library found in libxi6.
Non-developers likely have little use for this package.
@@ -99,8 +97,7 @@ Description: X11 Input extension library (development headers)
extension to the X protocol.
.
The Input extension allows setup and configuration of multiple input devices,
- and will soon allow hotplugging of input devices; to be added and removed on
- the fly.
+ and hotplugging of input devices (to be added and removed on the fly).
.
This package contains the development headers for the library found in
libxi6. Non-developers likely have little use for this package.
commit 7120c3fe8475f9f8175eb6232437a66784e23040
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 24 14:12:23 2016 +0100
Remove Drew and Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 7d293a1..284b2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxi (2:1.7.6-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove Drew and Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sun, 24 Jan 2016 13:59:40 +0100
diff --git a/debian/control b/debian/control
index 582bc4e..a0a311c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libxi
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
commit a8930fbbf6f8df8d6d1952620bce6490903e0b54
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 24 14:00:28 2016 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index c5d3b95..760b132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+commit 2286282f965064176b3b1492646c6e2e0f4ab7dd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Dec 22 11:20:01 2015 +1000
+
+ libXi 1.7.6
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 13f25bfb55f4a0bc1f614cbf9b0b13a50ecad8a0
+Author: Javier Pello <javier.pello@urjc.es>
+Date: Wed Oct 7 12:41:01 2015 +0200
+
+ Fix const compiler warnings
+
+ When invoking Data, Data16 and Data32 from XChangeDeviceProperty,
+ we must cast the data pointer to the right type, but we do not need
+ to cast constness away. This change allows to enable -Wcast-qual on
+ the build and have it complete without warnings.
+
+ Signed-off-by: Javier Pello <javier.pello@urjc.es>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 380861589690bcbe8b04b7a2c23b5dd5d10c4bf8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 19 11:46:41 2015 +1000
+
+ Don't use raw serial numbers in XIEvents
+
+ cookie->serial is an Xlib contoction, provided by _XSetLastRequestRead(). This
+ serial may be different to the raw serial number from the wire protocol.
+ This causes issues when the raw serial is used to e.g. compare the event to
+ other non-XI events.
+
+ Use the cookie's serial number instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=756649
+
+ See also https://bugs.freedesktop.org/show_bug.cgi?id=64687
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit f180dff710dc54d00e0e26b84de053151f8f207e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 10 01:16:19 2015 +1000
diff --git a/debian/changelog b/debian/changelog
index 54e3d61..7d293a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.7.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 24 Jan 2016 13:59:40 +0100
+
libxi (2:1.7.5-1) unstable; urgency=medium
[ Andreas Boll ]
commit 2286282f965064176b3b1492646c6e2e0f4ab7dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 22 11:20:01 2015 +1000
libXi 1.7.6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 9b40c4d..64033be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.7.5],
+AC_INIT([libXi], [1.7.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
commit 13f25bfb55f4a0bc1f614cbf9b0b13a50ecad8a0
Author: Javier Pello <javier.pello@urjc.es>
Date: Wed Oct 7 12:41:01 2015 +0200
Fix const compiler warnings
When invoking Data, Data16 and Data32 from XChangeDeviceProperty,
we must cast the data pointer to the right type, but we do not need
to cast constness away. This change allows to enable -Wcast-qual on
the build and have it complete without warnings.
Signed-off-by: Javier Pello <javier.pello@urjc.es>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XChDProp.c b/src/XChDProp.c
index c863cdb..786d664 100644
--- a/src/XChDProp.c
+++ b/src/XChDProp.c
@@ -74,7 +74,7 @@ XChangeDeviceProperty(Display* dpy, XDevice* dev,
len = ((long)nelements + 3) >> 2;
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
- Data (dpy, (char *)data, nelements);
+ Data (dpy, (_Xconst char *)data, nelements);
} /* else force BadLength */
break;
@@ -83,7 +83,7 @@ XChangeDeviceProperty(Display* dpy, XDevice* dev,
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
len = (long)nelements << 1;
- Data16 (dpy, (short *) data, len);
+ Data16 (dpy, (_Xconst short *) data, len);
} /* else force BadLength */
break;
@@ -92,7 +92,7 @@ XChangeDeviceProperty(Display* dpy, XDevice* dev,
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
len = (long)nelements << 2;
- Data32 (dpy, (long *) data, len);
+ Data32 (dpy, (_Xconst long *) data, len);
} /* else force BadLength */
break;
commit 380861589690bcbe8b04b7a2c23b5dd5d10c4bf8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 19 11:46:41 2015 +1000
Don't use raw serial numbers in XIEvents
cookie->serial is an Xlib contoction, provided by _XSetLastRequestRead(). This
serial may be different to the raw serial number from the wire protocol.
This causes issues when the raw serial is used to e.g. compare the event to
other non-XI events.
Use the cookie's serial number instead.
https://bugzilla.gnome.org/show_bug.cgi?id=756649
See also https://bugs.freedesktop.org/show_bug.cgi?id=64687
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 672d69a..a35fcc6 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1521,7 +1521,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie)
out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1794,7 +1794,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie)
cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1827,7 +1827,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie)
out->info = (XIHierarchyInfo*)&out[1];
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1868,7 +1868,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook
out = next_block(&ptr, sizeof(XIRawEvent));
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1919,7 +1919,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie)
out->buttons.mask = (unsigned char*)&out[1];
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1962,7 +1962,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie)
cookie->data = out;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1983,7 +1983,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
cookie->data = out;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -2011,7 +2011,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie)
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
Reply to: