ChangeLog | 22 ++++
Makefile.am | 2
Makefile.in | 2
debian/changelog | 8 +
debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff | 45
----------
debian/patches/series | 1
src/XExtInt.c | 20 ++--
7 files changed, 45 insertions(+), 55 deletions(-)
New commits:
commit 1609b6fa7008472348ab257ed0952f9caec2c781
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Mar 5 17:01:36 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 70bef32..dbb3915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (1:1.1.0-2) UNRELEASED; urgency=low
+libxi (1:1.1.0-2) experimental; urgency=low
* Pull fixes from upstream git.
+ remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied
upstream.
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 9 Feb 2007 16:45:03 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 5 Mar 2007 16:59:33 +0100
libxi (1:1.1.0-1) experimental; urgency=low
commit 9c69ba323c369ab8c8e56d54045e2c7196832978
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Mar 5 16:55:43 2007 +0100
Update upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index 32a92df..a4aead8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit c8696a5230c565f8999fea136a85a875b04e7b9a
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Dec 6 18:56:56 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+
+ Make ChangeLog hook as safe as possible.
+
+commit 60dccd9a7be95e35b4b8c90934888efedfde84cc
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Nov 19 01:04:26 2006 -0800
+
+ Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
+
+commit 41710257257939b181a1615937610550b40621b9
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Nov 8 16:19:58 2006 +0200
+
+ DevicePresenceNotify: remove verbosity, fill out all fields
+ Don't throw a printf every time we get a DPN, and fill in all the fields
+ when copying the structure.
+
commit eeebae55766bd4c0121479a7b7188d6a0545f66c
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Sat Oct 21 12:08:21 2006 +0300
commit 9578c2898933aa4d8462a81cea7c4967d9dfdc49
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Feb 9 16:51:21 2007 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index eecad18..b1de719 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -660,7 +660,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: ChangeLog
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
commit 7a65f974ab066b8177eac93950c3829e8006962c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Feb 9 16:46:06 2007 +0100
Delete patch applied upstream.
diff --git a/debian/changelog b/debian/changelog
index cb14d72..70bef32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxi (1:1.1.0-2) UNRELEASED; urgency=low
+
+ * Pull fixes from upstream git.
+ + remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied
+ upstream.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 9 Feb 2007 16:45:03 +0100
+
libxi (1:1.1.0-1) experimental; urgency=low
* Adjust Section values to what the override says.
diff --git a/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff
b/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff
deleted file mode 100644
index 515ccb8..0000000
--- a/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Jamey Sharp <[EMAIL PROTECTED]>
-Date: Sun, 19 Nov 2006 09:04:26 +0000 (-0800)
-Subject: Bug #8663: _XiCheckExtInit must drop the Display lock in all error
cases.
-X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/lib/libXi.git;a=commitdiff;h=60dccd9a7be95e35b4b8c90934888efedfde84cc
-
-Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
----
-
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -80,9 +80,6 @@ typedef struct _XInputData
- XExtensionVersion *vers;
- } XInputData;
-
--#define XInputCheckExtension(dpy,i,val) \
-- XextCheckExtension (dpy, i, xinput_extension_name, val)
--
- static /* const */ XExtensionHooks xinput_extension_hooks = {
- NULL, /* create_gc */
- NULL, /* copy_gc */
-@@ -183,6 +180,12 @@ _xidevicebusy(dpy, error)
- *error = info->codes->first_error + XI_DeviceBusy;
- }
-
-+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
-+{
-+ XextCheckExtension (dpy, info, xinput_extension_name, 0);
-+ return 1;
-+}
-+
- /***********************************************************************
- *
- * Check to see if the input extension is installed in the server.
-@@ -198,7 +201,10 @@ _XiCheckExtInit(dpy, version_index, info
- {
- XExtensionVersion *ext;
-
-- XInputCheckExtension(dpy, info, -1);
-+ if (!XInputCheckExtension(dpy, info)) {
-+ UnlockDisplay(dpy);
-+ return (-1);
-+ }
-
- if (info->data == NULL) {
- info->data = (XPointer) Xmalloc(sizeof(XInputData));
diff --git a/debian/patches/series b/debian/patches/series
index 552bdfc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-00_upstream_002_XiCheckExtInit_unlockdisplay.diff
commit c8696a5230c565f8999fea136a85a875b04e7b9a
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Dec 6 18:56:56 2006 +0200
Makefile.am: make ChangeLog hook safer
Make ChangeLog hook as safe as possible.
diff --git a/Makefile.am b/Makefile.am
index 48b6eea..0693217 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,6 @@ CLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
commit 60dccd9a7be95e35b4b8c90934888efedfde84cc
Author: Jamey Sharp <[EMAIL PROTECTED]>
Date: Sun Nov 19 01:04:26 2006 -0800
Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 427e406..8366104 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -80,9 +80,6 @@ typedef struct _XInputData
XExtensionVersion *vers;
} XInputData;
-#define XInputCheckExtension(dpy,i,val) \
- XextCheckExtension (dpy, i, xinput_extension_name, val)
-
static /* const */ XExtensionHooks xinput_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -183,6 +180,12 @@ _xidevicebusy(dpy, error)
*error = info->codes->first_error + XI_DeviceBusy;
}
+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
+{
+ XextCheckExtension (dpy, info, xinput_extension_name, 0);
+ return 1;
+}
+
/***********************************************************************
*
* Check to see if the input extension is installed in the server.
@@ -198,7 +201,10 @@ _XiCheckExtInit(dpy, version_index, info
{
XExtensionVersion *ext;
- XInputCheckExtension(dpy, info, -1);
+ if (!XInputCheckExtension(dpy, info)) {
+ UnlockDisplay(dpy);
+ return (-1);
+ }
if (info->data == NULL) {
info->data = (XPointer) Xmalloc(sizeof(XInputData));
commit 41710257257939b181a1615937610550b40621b9
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Nov 8 16:19:58 2006 +0200
DevicePresenceNotify: remove verbosity, fill out all fields
Don't throw a printf every time we get a DPN, and fill in all the fields
when copying the structure.
diff --git a/src/XExtInt.c b/src/XExtInt.c
index b7297dc..427e406 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -681,12 +681,12 @@ XInputWireToEvent(dpy, re, event)
XDevicePresenceNotifyEvent *ev = (XDevicePresenceNotifyEvent *) re;
devicePresenceNotify *ev2 = (devicePresenceNotify *) event;
- fprintf(stderr, "got DevicePresenceNotify event (reltype=%d)\n",
- reltype);
-
*ev = *(XDevicePresenceNotifyEvent *) save;
ev->window = 0;
ev->time = ev2->time;
+ ev->devchange = ev2->devchange;
+ ev->deviceid = ev2->deviceid;
+ ev->control = ev2->control;
return (ENQUEUE_EVENT);
}
break;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
