libx11: Changes to 'debian-experimental'
ChangeLog | 21 +++++++++++++++++++++
debian/changelog | 9 +++++++++
debian/rules | 4 ++--
modules/im/ximcp/imDefLkup.c | 2 +-
src/GetMoEv.c | 2 +-
5 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 4fa7b09916e6170a8bce061316125db71b129d0d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 13 20:15:33 2007 +0200
Install the upstream NEWS file rather than the git changelog.
diff --git a/debian/changelog b/debian/changelog
index 03c4102..1003aa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libx11 (2:1.1.2-2) UNRELEASED; urgency=low
* Pull two fixes from upstream git:
+ Fix locking in _XimGetWindowEventmask (closes: #427296).
+ fix XGetMotionEvents arguments order.
+ * Install the upstream NEWS file rather than the git changelog.
- -- Julien Cristau <jcristau@debian.org> Wed, 13 Jun 2007 20:10:57 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 13 Jun 2007 20:15:02 +0200
libx11 (2:1.1.2-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 0c94c7a..f36d28f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ binary-arch: build install
--exclude=usr/share/man/man3/XGetXCBConnection.3 \
--exclude=usr/share/man/man3/XSetEventQueueOwner.3
dh_install --sourcedir=debian/tmp -Nlibx11-dev -s
- dh_installchangelogs -s ChangeLog NEWS
+ dh_installchangelogs -s NEWS
dh_installman -s
dh_link -s
dh_strip -plibx11-6 --dbg-package=libx11-6-dbg
@@ -112,7 +112,7 @@ binary-indep: build install
dh_testroot
dh_installdocs -i
- dh_installchangelogs -i ChangeLog NEWS
+ dh_installchangelogs -i NEWS
dh_install --sourcedir=debian/tmp -i
dh_link -i
dh_installman -i
commit 38e45417a682b01a337e3db539a849a75fb4c2d2
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 13 20:14:02 2007 +0200
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 2cfd6e4..c56396c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72
+Author: Olivier Blin <blino@mandriva.org>
+Date: Mon Jun 11 18:32:09 2007 +1000
+
+ fix XGetMotionEvents arguments order - Fixes bug 11222
+
+commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 10 16:19:59 2007 -0700
+
+ Fix locking in _XimGetWindowEventmask.
+
+ Now that XFilterEvent drops the Display lock before invoking callback
+ functions, _XimGetWindowEventmask is called without the lock held. So
+ when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
+ that does not lock the Display, Xlib/XCB would assert:
+
+ xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
+
+ Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
+
commit 65f0ab5d46d80d55fc04d4eb14fa05f130eb8b9c
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jun 3 21:41:47 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index 0c07d81..03c4102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.1.2-2) UNRELEASED; urgency=low
+
+ * Pull two fixes from upstream git:
+ + Fix locking in _XimGetWindowEventmask (closes: #427296).
+ + fix XGetMotionEvents arguments order.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 13 Jun 2007 20:10:57 +0200
+
libx11 (2:1.1.2-1) experimental; urgency=low
[ Brice Goglin ]
commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72
Author: Olivier Blin <blino@mandriva.org>
Date: Mon Jun 11 18:32:09 2007 +1000
fix XGetMotionEvents arguments order - Fixes bug 11222
diff --git a/src/GetMoEv.c b/src/GetMoEv.c
index 2aa6c1a..dac1bfc 100644
--- a/src/GetMoEv.c
+++ b/src/GetMoEv.c
@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
XTimeCoord *XGetMotionEvents(
register Display *dpy,
+ Window w,
Time start,
Time stop,
- Window w,
int *nEvents) /* RETURN */
{
xGetMotionEventsReply rep;
commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jun 10 16:19:59 2007 -0700
Fix locking in _XimGetWindowEventmask.
Now that XFilterEvent drops the Display lock before invoking callback
functions, _XimGetWindowEventmask is called without the lock held. So
when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
that does not lock the Display, Xlib/XCB would assert:
xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index aa1aaaf..157b076 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -466,7 +466,7 @@ _XimGetWindowEventmask(
Xim im = (Xim )ic->core.im;
XWindowAttributes atr;
- if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+ if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
return 0;
return (EVENTMASK)atr.your_event_mask;
}
Reply to: