libxi: Changes to 'debian-unstable'
debian/changelog | 3
debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch | 49 +++++-----
2 files changed, 29 insertions(+), 23 deletions(-)
New commits:
commit 08e7d8e81c43be1aa033633a8779d6e2e617592d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 20 16:53:47 2010 +0100
Fix crash in Qt3 apps
Update patch from 2:1.3-2 to not crash if an app (like, say, anything
using Qt3) calls libXi functions but the extension isn't available
(closes: #568323). Thanks, Roman Mamedov!
diff --git a/debian/changelog b/debian/changelog
index c3088e3..bad6317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ libxi (2:1.3-3) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * Update patch from 2:1.3-2 to not crash if an app (like, say, anything
+ using Qt3) calls libXi functions but the extension isn't available
+ (closes: #568323). Thanks, Roman Mamedov!
[ Brice Goglin ]
* Remove Jamey Sharp and Josh Triplett from Uploaders, closes: #568276.
diff --git a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
index 47d32b6..6261652 100644
--- a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
+++ b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
@@ -18,11 +18,11 @@ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
src/XIint.h | 1 +
3 files changed, 77 insertions(+), 9 deletions(-)
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index e87ead8..125a72e 100644
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -173,6 +173,64 @@ static char *XInputErrorList[] = {
+Index: libxi/src/XExtInt.c
+===================================================================
+--- libxi.orig/src/XExtInt.c
++++ libxi/src/XExtInt.c
+@@ -173,6 +173,64 @@
"BadClass, invalid event class", /* BadClass */
};
@@ -87,7 +87,7 @@ index e87ead8..125a72e 100644
_X_HIDDEN
XExtDisplayInfo *XInput_find_display (Display *dpy)
{
-@@ -180,10 +237,12 @@ XExtDisplayInfo *XInput_find_display (Display *dpy)
+@@ -180,12 +238,16 @@
if (!xinput_info) { if (!(xinput_info = XextCreateExtension())) return NULL; }
if (!(dpyinfo = XextFindDisplay (xinput_info, dpy)))
{
@@ -97,15 +97,21 @@ index e87ead8..125a72e 100644
xinput_extension_name,
&xinput_extension_hooks,
- IEVENTS, NULL);
+- XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie);
+- XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie);
+ nevents, NULL);
- XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie);
- XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie);
++ if (dpyinfo->codes) {
++ XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie);
++ XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie);
++ }
}
-diff --git a/src/XGetVers.c b/src/XGetVers.c
-index 3b500ae..4718617 100644
---- a/src/XGetVers.c
-+++ b/src/XGetVers.c
-@@ -72,19 +72,15 @@ XGetExtensionVersion(register Display * dpy, _Xconst char *name)
+ return dpyinfo;
+ }
+Index: libxi/src/XGetVers.c
+===================================================================
+--- libxi.orig/src/XGetVers.c
++++ libxi/src/XGetVers.c
+@@ -72,19 +72,15 @@
return (ext);
}
@@ -128,7 +134,7 @@ index 3b500ae..4718617 100644
req->ReqType = X_GetExtensionVersion;
req->nbytes = strlen(name);
req->length += (unsigned)(req->nbytes + 3) >> 2;
-@@ -93,6 +89,7 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name,
+@@ -93,6 +89,7 @@
if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) {
return (XExtensionVersion *) NULL;
}
@@ -136,7 +142,7 @@ index 3b500ae..4718617 100644
ext = (XExtensionVersion *) Xmalloc(sizeof(XExtensionVersion));
if (ext) {
ext->present = rep.present;
-@@ -101,5 +98,16 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name,
+@@ -101,5 +98,16 @@
ext->minor_version = rep.minor_version;
}
}
@@ -154,11 +160,11 @@ index 3b500ae..4718617 100644
+
+ return _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode);
}
-diff --git a/src/XIint.h b/src/XIint.h
-index 400c920..00e84d3 100644
---- a/src/XIint.h
-+++ b/src/XIint.h
-@@ -14,6 +14,7 @@ extern XExtDisplayInfo *XInput_find_display(Display *);
+Index: libxi/src/XIint.h
+===================================================================
+--- libxi.orig/src/XIint.h
++++ libxi/src/XIint.h
+@@ -14,6 +14,7 @@
extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
@@ -166,6 +172,3 @@ index 400c920..00e84d3 100644
extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *);
extern Status _XiEventToWire(
---
-1.6.6
-
Reply to: