.gitignore | 55 ChangeLog | 1128 Makefile.am | 4 Makefile.in | 755 README | 77 acinclude.m4 | 2 aclocal.m4 | 8347 ---- compile | 142 config.guess | 1526 config.sub | 1658 configure |26908 ------------- configure.ac | 42 cpprules.in | 4 debian/README.source | 73 debian/changelog | 68 debian/control | 14 debian/libx11-6.install | 3 debian/libx11-6.preinst.in | 20 debian/libx11-6.symbols | 1233 debian/libx11-data.install | 178 debian/libx11-xcb1.install | 3 debian/patches/002_arm_abi_brain_damage.diff | 28 debian/patches/003_recognize_glibc_2.3.2_locale_names.diff | 281 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 1493 debian/patches/007_iso8859-15_Compose_fix.diff | 4 debian/patches/008_remove_ko_Compose.diff | 8 debian/patches/009_remove_th_Compose.diff | 15 debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff | 237 debian/patches/015_russian_locale_alias.diff | 10 debian/patches/series | 3 debian/rules | 24 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs.mk | 29 debian/xsfbs/xsfbs.sh | 78 depcomp | 589 include/.gitignore | 2 include/Makefile.in | 493 include/X11/.gitignore | 2 include/X11/Xlib-xcb.h | 5 include/X11/Xlib.h | 44 include/X11/Xlibint.h | 74 include/X11/cursorfont.h | 5 install-sh | 519 ltmain.sh | 6964 --- man/.gitignore | 3 man/Makefile.am | 9 man/Makefile.in | 2092 - man/XAllocColor.man | 2 man/XCreateColormap.man | 2 man/XCreateFontCursor.man | 2 man/XGetEventData.man | 223 man/XReadBitmapFile.man | 2 man/xkb/Makefile.in | 660 man/xkb/XkbGetKeyboard.man | 2 man/xkb/XkbSAGroup.man | 1 man/xkb/XkbSASetGroup.man | 1 man/xkb/XkbSetIndicatorMap.man | 3 missing | 367 mkinstalldirs | 161 modules/.gitignore | 2 modules/Makefile.in | 539 modules/im/.gitignore | 2 modules/im/Makefile.in | 539 modules/im/ximcp/.gitignore | 7 modules/im/ximcp/Makefile.in | 621 modules/im/ximcp/imDefLkup.c | 11 modules/im/ximcp/imDispch.c | 6 modules/im/ximcp/imInsClbk.c | 3 modules/im/ximcp/imInt.c | 11 modules/im/ximcp/imLcFlt.c | 8 modules/im/ximcp/imLcGIc.c | 4 modules/im/ximcp/imLcIm.c | 3 modules/im/ximcp/imLcLkup.c | 54 modules/im/ximcp/imLcPrs.c | 2 modules/im/ximcp/imLcSIc.c | 4 modules/im/ximcp/imRm.c | 30 modules/im/ximcp/imThaiFlt.c | 56 modules/im/ximcp/imThaiIm.c | 12 modules/im/ximcp/imTrX.c | 7 modules/im/ximcp/imTransR.c | 23 modules/lc/.gitignore | 2 modules/lc/Makefile.in | 539 modules/lc/Utf8/.gitignore | 7 modules/lc/Utf8/Makefile.in | 562 modules/lc/Utf8/lcUTF8Load.c | 14 modules/lc/def/.gitignore | 7 modules/lc/def/Makefile.in | 560 modules/lc/def/lcDefConv.c | 2 modules/lc/gen/.gitignore | 7 modules/lc/gen/Makefile.in | 560 modules/lc/gen/lcGenConv.c | 2 modules/lc/xlocale/.gitignore | 7 modules/lc/xlocale/Makefile.in | 564 modules/lc/xlocale/lcJis.c | 2 modules/om/.gitignore | 2 modules/om/Makefile.in | 539 modules/om/generic/.gitignore | 7 modules/om/generic/Makefile.in | 579 modules/om/generic/omGeneric.c | 2 nls/.gitignore | 11 nls/C/.gitignore | 4 nls/C/Makefile.in | 467 nls/Makefile.am | 2 nls/Makefile.in | 685 nls/am_ET.UTF-8/.gitignore | 4 nls/am_ET.UTF-8/Makefile.in | 467 nls/armscii-8/.gitignore | 4 nls/armscii-8/Makefile.in | 467 nls/compose.dir.pre | 30 nls/el_GR.UTF-8/.gitignore | 4 nls/el_GR.UTF-8/Compose.pre | 433 nls/el_GR.UTF-8/Makefile.in | 467 nls/en_US.UTF-8/.gitignore | 4 nls/en_US.UTF-8/Compose.pre | 2078 - nls/en_US.UTF-8/Makefile.in | 467 nls/en_US.UTF-8/XLC_LOCALE.pre | 198 nls/fi_FI.UTF-8/Compose.pre | 5156 ++ nls/fi_FI.UTF-8/Makefile.am | 3 nls/georgian-academy/.gitignore | 4 nls/georgian-academy/Makefile.in | 467 nls/georgian-ps/.gitignore | 4 nls/georgian-ps/Makefile.in | 467 nls/ibm-cp1133/.gitignore | 4 nls/ibm-cp1133/Makefile.in | 467 nls/iscii-dev/.gitignore | 4 nls/iscii-dev/Makefile.in | 467 nls/isiri-3342/.gitignore | 4 nls/isiri-3342/Makefile.in | 467 nls/iso8859-1/.gitignore | 4 nls/iso8859-1/Makefile.in | 467 nls/iso8859-10/.gitignore | 4 nls/iso8859-10/Makefile.in | 467 nls/iso8859-11/.gitignore | 4 nls/iso8859-11/Makefile.in | 467 nls/iso8859-13/.gitignore | 4 nls/iso8859-13/Makefile.in | 467 nls/iso8859-14/.gitignore | 4 nls/iso8859-14/Makefile.in | 467 nls/iso8859-15/.gitignore | 4 nls/iso8859-15/Makefile.in | 467 nls/iso8859-2/.gitignore | 4 nls/iso8859-2/Makefile.in | 467 nls/iso8859-3/.gitignore | 4 nls/iso8859-3/Makefile.in | 467 nls/iso8859-4/.gitignore | 4 nls/iso8859-4/Makefile.in | 467 nls/iso8859-5/.gitignore | 4 nls/iso8859-5/Makefile.in | 467 nls/iso8859-6/.gitignore | 4 nls/iso8859-6/Makefile.in | 467 nls/iso8859-7/.gitignore | 4 nls/iso8859-7/Makefile.in | 467 nls/iso8859-8/.gitignore | 4 nls/iso8859-8/Makefile.in | 467 nls/iso8859-9/.gitignore | 4 nls/iso8859-9/Makefile.in | 467 nls/iso8859-9e/.gitignore | 4 nls/iso8859-9e/Makefile.in | 467 nls/ja.JIS/.gitignore | 4 nls/ja.JIS/Makefile.in | 467 nls/ja.S90/.gitignore | 4 nls/ja.S90/Makefile.in | 467 nls/ja.SJIS/.gitignore | 4 nls/ja.SJIS/Makefile.in | 467 nls/ja.U90/.gitignore | 4 nls/ja.U90/Makefile.in | 467 nls/ja/.gitignore | 4 nls/ja/Makefile.in | 467 nls/ja_JP.UTF-8/.gitignore | 4 nls/ja_JP.UTF-8/Makefile.in | 467 nls/ko/.gitignore | 4 nls/ko/Makefile.in | 467 nls/ko_KR.UTF-8/.gitignore | 4 nls/ko_KR.UTF-8/Makefile.in | 467 nls/koi8-c/.gitignore | 4 nls/koi8-c/Makefile.in | 467 nls/koi8-r/.gitignore | 4 nls/koi8-r/Makefile.in | 467 nls/koi8-u/.gitignore | 4 nls/koi8-u/Makefile.in | 467 nls/locale.alias.pre | 136 nls/locale.dir.pre | 25 nls/microsoft-cp1251/.gitignore | 4 nls/microsoft-cp1251/Makefile.in | 467 nls/microsoft-cp1255/.gitignore | 4 nls/microsoft-cp1255/Makefile.in | 467 nls/microsoft-cp1256/.gitignore | 4 nls/microsoft-cp1256/Makefile.in | 467 nls/mulelao-1/.gitignore | 4 nls/mulelao-1/Makefile.in | 467 nls/nokhchi-1/.gitignore | 4 nls/nokhchi-1/Makefile.in | 467 nls/pt_BR.UTF-8/.gitignore | 4 nls/pt_BR.UTF-8/Compose.pre | 1487 nls/pt_BR.UTF-8/Makefile.in | 467 nls/ru_RU.UTF-8/Compose.pre | 1 nls/ru_RU.UTF-8/Makefile.am | 3 nls/ru_RU.UTF-8/Makefile.in | 467 nls/ru_RU.UTF-8/XI18N_OBJS | 7 nls/ru_RU.UTF-8/XLC_LOCALE.pre | 169 nls/tatar-cyr/.gitignore | 4 nls/tatar-cyr/Makefile.in | 467 nls/th_TH.UTF-8/.gitignore | 4 nls/th_TH.UTF-8/Makefile.in | 467 nls/th_TH.UTF-8/XLC_LOCALE.pre | 12 nls/th_TH/.gitignore | 4 nls/th_TH/Makefile.in | 467 nls/th_TH/XLC_LOCALE.pre | 6 nls/tscii-0/.gitignore | 4 nls/tscii-0/Makefile.in | 467 nls/vi_VN.tcvn/.gitignore | 4 nls/vi_VN.tcvn/Makefile.in | 467 nls/vi_VN.viscii/.gitignore | 4 nls/vi_VN.viscii/Makefile.in | 467 nls/zh_CN.UTF-8/.gitignore | 4 nls/zh_CN.UTF-8/Makefile.in | 467 nls/zh_CN.gb18030/.gitignore | 4 nls/zh_CN.gb18030/Makefile.in | 467 nls/zh_CN.gbk/.gitignore | 4 nls/zh_CN.gbk/Makefile.in | 467 nls/zh_CN/.gitignore | 4 nls/zh_CN/Makefile.in | 467 nls/zh_HK.UTF-8/.gitignore | 4 nls/zh_HK.UTF-8/Makefile.in | 467 nls/zh_HK.big5/.gitignore | 4 nls/zh_HK.big5/Makefile.in | 467 nls/zh_HK.big5hkscs/.gitignore | 4 nls/zh_HK.big5hkscs/Makefile.in | 467 nls/zh_TW.UTF-8/.gitignore | 4 nls/zh_TW.UTF-8/Makefile.in | 467 nls/zh_TW.big5/.gitignore | 4 nls/zh_TW.big5/Makefile.in | 467 nls/zh_TW/.gitignore | 4 nls/zh_TW/Makefile.in | 467 src/.gitignore | 12 src/ChkIfEv.c | 1 src/ChkMaskEv.c | 6 src/ChkTypEv.c | 4 src/ChkTypWEv.c | 4 src/ChkWinEv.c | 6 src/ConnDis.c | 7 src/Context.c | 11 src/CrGlCur.c | 4 src/ErrDes.c | 2 src/FreeEventData.c | 42 src/GetEventData.c | 42 src/Host.c | 24 src/IfEvent.c | 1 src/ImUtil.c | 2 src/InitExt.c | 43 src/Makefile.am | 5 src/Makefile.in | 1256 src/MaskEvent.c | 6 src/NextEvent.c | 4 src/OpenDis.c | 22 src/ParseGeom.c | 18 src/PeekEvent.c | 5 src/PeekIfEv.c | 5 src/PutBEvent.c | 18 src/Region.c | 146 src/StBytes.c | 2 src/WinEvent.c | 6 src/XErrorDB | 58 src/XKeysymDB | 2 src/XlibInt.c | 208 src/Xrm.c | 14 src/config.h.in | 190 src/locking.c | 109 src/util/.gitignore | 4 src/util/Makefile.in | 514 src/util/makekeys.c | 26 src/utlist.h | 116 src/x11_trans.c | 4 src/xcb_disp.c | 16 src/xcb_io.c | 26 src/xcms/.gitignore | 7 src/xcms/Makefile.in | 682 src/xkb/.gitignore | 7 src/xkb/Makefile.in | 556 src/xkb/XKBBind.c | 2 src/xkb/XKBMisc.c | 2 src/xlibi18n/.gitignore | 7 src/xlibi18n/ICWrap.c | 48 src/xlibi18n/IMWrap.c | 24 src/xlibi18n/Makefile.am | 2 src/xlibi18n/Makefile.in | 688 src/xlibi18n/XimTrans.h | 6 src/xlibi18n/Ximint.h | 8 src/xlibi18n/Xlcint.h | 5 src/xlibi18n/imKStoUCS.c | 4 src/xlibi18n/lcCT.c | 4 src/xlibi18n/lcFile.c | 22 src/xlibi18n/lcGeneric.c | 3 src/xlibi18n/lcInit.c | 4 src/xlibi18n/lcUTF8.c | 552 src/xlibi18n/lcUniConv/big5hkscs.h | 6252 +++ src/xlibi18n/lcUniConv/cjk_tab_to_h.c | 47 src/xlibi18n/lcUniConv/gbk.h | 6200 ++ src/xlibi18n/lcUniConv/ksc5601.h | 12 src/xlibi18n/lcWrap.c | 6 x11.pc.in | 2 301 files changed, 23318 insertions(+), 95669 deletions(-)
New commits: commit 2d33e739a72d324e386bd3e2dd7472b0a84fc17f Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 17:05:01 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index c0c0bc2..3539aea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libx11 (2:1.2.99.901-1) UNRELEASED; urgency=low +libx11 (2:1.2.99.901-1) experimental; urgency=low [ Brice Goglin ] * Bump Standards-Version to 3.8.2. @@ -13,7 +13,7 @@ libx11 (2:1.2.99.901-1) UNRELEASED; urgency=low + add {left,right}wards arrow to en_US.UTF-8 compose table (closes: #532117). Thanks, Filippo Giunchedi! - -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 22:32:52 +0200 + -- Julien Cristau <jcris...@debian.org> Wed, 05 Aug 2009 17:04:28 +0200 libx11 (2:1.2.2-1) unstable; urgency=low commit a32cadc2f0bb78e7ad7e9c9a0c4a457ab6c2900e Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 16:30:25 2009 +0200 Use a wildcard in libx11-xcb1.install diff --git a/debian/changelog b/debian/changelog index f6d7cd1..c0c0bc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ libx11 (2:1.2.99.901-1) UNRELEASED; urgency=low [ Julien Cristau ] * Drop 002_arm_abi_brain_damage.diff, the old ABI arm port is gone. - * Use a glob in libx11-6.install. + * Use a glob in libx11-6.install and libx11-xcb1.install. * Add tentative symbols file for libX11.so.6. Many private symbols still included. * Build-depend on dpkg 1.15.3, to get support for tags in the symbols file. diff --git a/debian/libx11-xcb1.install b/debian/libx11-xcb1.install index 0222602..04e114f 100644 --- a/debian/libx11-xcb1.install +++ b/debian/libx11-xcb1.install @@ -1,2 +1 @@ -usr/lib/libX11-xcb.so.1 -usr/lib/libX11-xcb.so.1.0.0 +usr/lib/libX11-xcb.so.1* commit 35e823de8d3e1e756b95c123fd32269ff7e963a7 Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 16:27:51 2009 +0200 Build-depend on dpkg 1.15.3, to get support for tags in the symbols file. diff --git a/debian/changelog b/debian/changelog index 3022455..f6d7cd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libx11 (2:1.2.99.901-1) UNRELEASED; urgency=low * Use a glob in libx11-6.install. * Add tentative symbols file for libX11.so.6. Many private symbols still included. + * Build-depend on dpkg 1.15.3, to get support for tags in the symbols file. * New upstream release candidate + add {left,right}wards arrow to en_US.UTF-8 compose table (closes: #532117). Thanks, Filippo Giunchedi! diff --git a/debian/control b/debian/control index 6c37d1a..a9226f0 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <dnusi...@debian.org>, Josh Triplett <j...@freedesktop.org>, Jamey Sharp <sharp...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5.0.0), + dpkg-dev (>= 1.15.3), pkg-config, xtrans-dev, x11proto-core-dev (>= 7.0.13), commit e213c94f9e39cbe5158f31c089498eeb088b810d Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 15:47:16 2009 +0200 Update symbols file for new event cookie handling diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols index 699247b..2c0c688 100644 --- a/debian/libx11-6.symbols +++ b/debian/libx11-6.symbols @@ -134,6 +134,7 @@ libX11.so.6 libx11-6 #MINVER# xeheadofextensionl...@base 0 xesetbeforefl...@base 0 xesetclosedisp...@base 0 + xesetcopyeventcoo...@base 2:1.2.99.901 xesetcop...@base 0 xesetcreatef...@base 0 xesetcreat...@base 0 @@ -146,6 +147,7 @@ libX11.so.6 libx11-6 #MINVER# xesetprinterrorval...@base 0 xesetwiretoer...@base 0 xesetwiretoev...@base 0 + xesetwiretoeventcoo...@base 2:1.2.99.901 xemptyreg...@base 0 xenableaccesscont...@base 0 xequalreg...@base 0 @@ -172,6 +174,7 @@ libX11.so.6 libx11-6 #MINVER# xfreecolor...@base 0 xfreecol...@base 0 xfreecur...@base 0 + xfreeeventd...@base 2:1.2.99.901 xfreeextensionl...@base 0 xfreef...@base 0 xfreefonti...@base 0 @@ -191,6 +194,7 @@ libX11.so.6 libx11-6 #MINVER# xgetdefa...@base 0 xgeterrordatabaset...@base 0 xgeterrort...@base 0 + xgeteventd...@base 2:1.2.99.901 xgetfontp...@base 0 xgetfontprope...@base 0 xgetgcval...@base 0 @@ -784,6 +788,7 @@ libX11.so.6 libx11-6 #MINVER# (optional)_xclos...@base 0 1 (optional)_xcolor_to_xcms...@base 0 1 (optional)_xconnect...@base 0 1 + _xcopyeventcoo...@base 2:1.2.99.901 (optional)_xcopyto...@base 0 1 _xcreatemutex...@base 0 (arch=alpha amd64 ia64)_xdat...@base 0 @@ -802,11 +807,13 @@ libX11.so.6 libx11-6 #MINVER# _xeventsque...@base 0 (optional)_xf86bigfontfreefontmetr...@base 0 1 _xf86loadquerylocalef...@base 0 + _xfetcheventcoo...@base 2:1.2.99.901 _xfl...@base 0 _xflushgcca...@base 0 (optional)_xfreeatomta...@base 0 1 (optional)_xfreedisplaylock...@base 0 1 (optional)_xfreedisplaystruct...@base 0 1 + _xfreeeventcook...@base 2:1.2.99.901 _xfreeextd...@base 0 _xfreemutex...@base 0 _xfreet...@base 0 @@ -828,6 +835,7 @@ libX11.so.6 libx11-6 #MINVER# _xinitimagefuncp...@base 0 (optional)_xinitkeysy...@base 0 1 (optional)_xini...@base 0 1 + _xiseventcoo...@base 2:1.2.99.901 (optional)_xkeyinitial...@base 0 1 (optional)_xkeycodetokey...@base 0 1 (optional)_xkeysymtokeyc...@base 0 1 @@ -862,13 +870,16 @@ libX11.so.6 libx11-6 #MINVER# _xsetlastrequestr...@base 0 (optional)_xsetprivsyncfunct...@base 0 1 (optional)_xsetseqsyncfunct...@base 0 1 + _xstoreeventcoo...@base 2:1.2.99.901 _xtextheigh...@base 0 _xtexthei...@base 0 (optional)_xtranslate...@base 0 1 (optional)_xtranslatekey...@base 0 1 (optional)_xtryshapebitmapcur...@base 0 1 + _xunknowncopyeventcoo...@base 2:1.2.99.901 _xunknownnativeev...@base 0 _xunknownwireev...@base 0 + _xunknownwireeventcoo...@base 2:1.2.99.901 _xunlockmutex...@base 0 _xunregisterfil...@base 0 _xunregisterinternalconnect...@base 0 commit ff7a5cba167da85ffe2d7bc721ffec452cfa9620 Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 16:25:50 2009 +0200 Update changelogs diff --git a/ChangeLog b/ChangeLog index c28af91..2d0b18e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,132 @@ +commit 9da7e230d5320e1556ad2084fcd06ee7994385ea +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Aug 5 14:15:02 2009 +1000 + + Bump to 1.2.99.901 (1.3 RC1) + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 8f78c7b4e3570cd46c5a220982963c17fe2157b8 +Author: Filippo Giunchedi <fili...@debian.org> +Date: Sat Jun 6 16:56:54 2009 +0200 + + nls: add {left,right}wards arrow to compose table + + Debian bug#532117 <http://bugs.debian.org/532117> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 7949bfa00390241d994f32463e50d4bd78920568 +Author: Julien Cristau <jcris...@debian.org> +Date: Fri Jul 31 13:33:52 2009 +0200 + + Update library version for new symbols + + Commit 554f755e5545f63d3c8f299297927238da155773 added generic event + cookie handling. Bump libX11 version number accordingly. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 640fec5f4feacd01a00eea3dcd4edb220907d3dc +Author: Julien Cristau <jcris...@debian.org> +Date: Sun Aug 2 17:18:31 2009 +0200 + + Add _XFUNCPROTOBEGIN/END to Xlib-xcb.h + + X.Org bug#22252 <https://bugs.freedesktop.org/show_bug.cgi?id=22252> + + Reported-by: Riku Salminen <rsalm...@cc.hut.fi> + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit bc06d49e9dac1836d6824769ddb2ac5ba9f14df7 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Jul 29 08:44:09 2009 +1000 + + Fix compiler warning 'unused variable qelt' + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 03f4907e14f5755e72309f08742977b871e81e33 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Jul 29 08:34:57 2009 +1000 + + Add utlist.h to the Makefile.am + + utlist.h contains the linked list macros, it was added with the recent + addition of event cookies but utlist.h wasn't added to the Makefile.am. As a + result, make dist failed. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 554f755e5545f63d3c8f299297927238da155773 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jun 26 11:27:43 2009 +1000 + + Add generic event cookie handling to libX11. + + Generic events require more bytes than Xlib provides in the standard XEvent. + Memory allocated by the extension and stored as pointers inside the event is + prone to leak by simple 'while (1) { XNextEvent(...); }' loops. + + This patch adds cookie handling for generic events. Extensions may register + a cookie handler in addition to the normal event vectors. If an extension + has registered a cookie handler, _all_ generic events for this extensions + must be handled through cookies. Otherwise, the default event handler is + used. + + The cookie handler must return an XGenericEventCookie with a pointer to the + data.The rest of the event (type, serialNumber, etc.) are to be filled as + normal. When a client retrieves such a cookie event, the data is stored in + an internal queue (the 'cookiejar'). This data is freed on the next call to + XNextEvent(). + + New extension interfaces: + XESetWireToEventCookie(display, extension_number, cookie_handler) + + Where cookie_handler must set cookie->data. The data pointer is of arbitray + size and type but must be a single memory block. This memory block + represents the actual extension's event. + + New client interfaces: + XGetEventData(display, *cookie); + XFreeEventData(display, *cookie); + + If the client needs the actual event data, it must call XGetEventData() with + the cookie. This returns the data pointer (and removes it from the cookie + jar) and the client is then responsible for freeing the event with + XFreeEventData(). It is safe to call either function with a non-cookie + event. Events unclaimed or not handled by the XGetEventData() are cleaned up + automatically. + + Example client code: + XEvent event; + XGenericEventCookie *cookie = &ev; + + XNextEvent(display, &event); + if (XGetEventData(display, cookie)) { + XIEvent *xievent = cookie->data; + ... + } else if (cookie->type == GenericEvent) { + /* handle generic event */ + } else { + /* handle extension/core event */ + } + XFreeEventData(display, cookie); + + Cookies are not multi-threading safe. Clients that use XGetEventData() must + lock between XNextEvent and XGetEventData to avoid other threads freeing + cookies. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit d7675cb8fa7155e7aff1459636a117a97aa1bf28 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Jul 6 13:17:35 2009 +1000 + + Bump to 1.2.99.1 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit 75fe48e7a42a685d7098e8d7108b9b956c471563 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Jul 10 14:07:34 2009 +1000 diff --git a/debian/changelog b/debian/changelog index f7f7f7d..3022455 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libx11 (2:1.2.2-2) UNRELEASED; urgency=low +libx11 (2:1.2.99.901-1) UNRELEASED; urgency=low [ Brice Goglin ] * Bump Standards-Version to 3.8.2. @@ -8,6 +8,9 @@ libx11 (2:1.2.2-2) UNRELEASED; urgency=low * Use a glob in libx11-6.install. * Add tentative symbols file for libX11.so.6. Many private symbols still included. + * New upstream release candidate + + add {left,right}wards arrow to en_US.UTF-8 compose table + (closes: #532117). Thanks, Filippo Giunchedi! -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 22:32:52 +0200 commit aa1a06352212d170c594fdf5f60907b74a0d9c7e Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 5 15:32:18 2009 +0200 libx11-6.symbols: add more private symbols diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols index 6340a8a..699247b 100644 --- a/debian/libx11-6.symbols +++ b/debian/libx11-6.symbols @@ -472,6 +472,7 @@ libX11.so.6 libx11-6 #MINVER# xcmscielabcl...@base 0 xcmscielabclip...@base 0 xcmscielabcli...@base 0 + (optional)xcmscielabcolorsp...@base 0 1 xcmscielabquerym...@base 0 xcmscielabquerym...@base 0 xcmscielabqueryma...@base 0 @@ -481,19 +482,23 @@ libX11.so.6 libx11-6 #MINVER# xcmscieluvcl...@base 0 xcmscieluvclip...@base 0 xcmscieluvcli...@base 0 + (optional)xcmscieluvcolorsp...@base 0 1 xcmscieluvquerym...@base 0 xcmscieluvquerym...@base 0 xcmscieluvqueryma...@base 0 xcmscieluvquerym...@base 0 xcmscieluvtocie...@base 0 xcmscieluvwhiteshiftcol...@base 0 + (optional)xcmsciexyzcolorsp...@base 0 1 xcmsciexyztocie...@base 0 xcmsciexyztocie...@base 0 xcmsciexyztocie...@base 0 xcmsciexyztor...@base 0 + (optional)xcmscieuvycolorsp...@base 0 1 xcmscieuvytocie...@base 0 xcmscieuvytocie...@base 0 xcmscieuvytotek...@base 0 + (optional)xcmsciexyycolorsp...@base 0 1 xcmsciexyytocie...@base 0 xcmsclientwhitepointof...@base 0 xcmsconvertcol...@base 0 @@ -502,6 +507,7 @@ libX11.so.6 libx11-6 #MINVER# xcmsdisplayof...@base 0 xcmsformatofpre...@base 0 xcmsfree...@base 0 + (optional)xcmslinearrgbfunction...@base 0 1 xcmslookupco...@base 0 xcmsprefixoffor...@base 0 xcmsquerybl...@base 0 @@ -511,7 +517,9 @@ libX11.so.6 libx11-6 #MINVER# xcmsquerygr...@base 0 xcmsquery...@base 0 xcmsquerywh...@base 0 + (optional)xcmsrgbcolorsp...@base 0 1 xcmsrgbtor...@base 0 + (optional)xcmsrgbicolorsp...@base 0 1 xcmsrgbitocie...@base 0 xcmsrgbito...@base 0 xcmsscreennumberof...@base 0 @@ -525,6 +533,7 @@ libX11.so.6 libx11-6 #MINVER# xcmstekhvccl...@base 0 xcmstekhvccl...@base 0 xcmstekhvccli...@base 0 + (optional)xcmstekhvccolorsp...@base 0 1 xcmstekhvcquerym...@base 0 xcmstekhvcquerym...@base 0 xcmstekhvcqueryma...@base 0 @@ -532,6 +541,7 @@ libX11.so.6 libx11-6 #MINVER# xcmstekhvcquerym...@base 0 xcmstekhvctocie...@base 0 xcmstekhvcwhiteshiftcol...@base 0 + (optional)xcmsundefinedcolorsp...@base 0 1 xcmsvisualof...@base 0 xkbadddeviceledi...@base 0 xkbaddgeomco...@base 0 @@ -772,6 +782,8 @@ libX11.so.6 libx11-6 #MINVER# _xalloct...@base 0 _xasyncerrorhand...@base 0 (optional)_xclos...@base 0 1 + (optional)_xcolor_to_xcms...@base 0 1 + (optional)_xconnect...@base 0 1 (optional)_xcopyto...@base 0 1 _xcreatemutex...@base 0 (arch=alpha amd64 ia64)_xdat...@base 0 @@ -788,12 +800,17 @@ libX11.so.6 libx11-6 #MINVER# _xerrorfunct...@base 0 _xeventtow...@base 0 _xeventsque...@base 0 + (optional)_xf86bigfontfreefontmetr...@base 0 1 _xf86loadquerylocalef...@base 0 _xfl...@base 0 _xflushgcca...@base 0 + (optional)_xfreeatomta...@base 0 1 + (optional)_xfreedisplaylock...@base 0 1 + (optional)_xfreedisplaystruct...@base 0 1 _xfreeextd...@base 0 _xfreemutex...@base 0 _xfreet...@base 0 + (optional)_xfreex11xcbstruct...@base 0 1 _xgetasyncd...@base 0 _xgetasyncre...@base 0 _xgetbitsperpi...@base 0 @@ -801,14 +818,25 @@ libX11.so.6 libx11-6 #MINVER# _xgetlcval...@base 0 _xgetscanline...@base 0 _xgetwindowattribu...@base 0 + (optional)_xheadofdisplayl...@base 0 1 (optional)_xidhand...@base 0 1 (optional)_ximcompileresourcel...@base 0 1 _xioer...@base 0 _xioerrorfunct...@base 0 + (optional)_xinitdisplaylock...@base 0 1 (optional)_xini...@base 0 1 _xinitimagefuncp...@base 0 + (optional)_xinitkeysy...@base 0 1 (optional)_xini...@base 0 1 + (optional)_xkeyinitial...@base 0 1 + (optional)_xkeycodetokey...@base 0 1 + (optional)_xkeysymtokeyc...@base 0 1 + (optional)_xkeysymtomodifi...@base 0 1 _xlockmutex...@base 0 + (optional)_xlookupkey...@base 0 1 + (optional)_xlookupstr...@base 0 1 + (optional)_xnoticecreatebit...@base 0 1 + (optional)_xnoticeputbit...@base 0 1 (optional)_xope...@base 0 1 (optional)_xparsebasefontnamel...@base 0 1 _xpollfdcache...@base 0 @@ -821,6 +849,7 @@ libX11.so.6 libx11-6 #MINVER# _xr...@base 0 _xreadeve...@base 0 _xread...@base 0 + (optional)_xrefreshkeyboardmapp...@base 0 1 (optional)_xregisterfilterbym...@base 0 1 (optional)_xregisterfilterbyt...@base 0 1 _xregisterinternalconnect...@base 0 @@ -832,13 +861,20 @@ libX11.so.6 libx11-6 #MINVER# _xsetim...@base 0 _xsetlastrequestr...@base 0 (optional)_xsetprivsyncfunct...@base 0 1 + (optional)_xsetseqsyncfunct...@base 0 1 _xtextheigh...@base 0 _xtexthei...@base 0 + (optional)_xtranslate...@base 0 1 + (optional)_xtranslatekey...@base 0 1 + (optional)_xtryshapebitmapcur...@base 0 1 _xunknownnativeev...@base 0 _xunknownwireev...@base 0 _xunlockmutex...@base 0 _xunregisterfil...@base 0 _xunregisterinternalconnect...@base 0 + (optional)_xunresolveco...@base 0 1 + (optional)_xupdateatomca...@base 0 1 + (optional)_xupdategcca...@base 0 1 _xvidtovis...@base 0 _xwiretoev...@base 0 _xcmsaddcmap...@base 0 @@ -893,6 +929,7 @@ libX11.so.6 libx11-6 #MINVER# _xcmstekhvc_pre...@base 0 _xcmsunresolveco...@base 0 _xde...@base 0 + (optional)_xevent_to_m...@base 0 1 _xglobal_l...@base 0 _xi18n_l...@base 0 _ximcbdispa...@base 0 @@ -1044,6 +1081,27 @@ libX11.so.6 libx11-6 #MINVER# _ximctsto...@base 0 _ximctstou...@base 0 _ximctsto...@base 0 + (optional)_xkbcopyfromreadbuf...@base 0 1 + (optional)_xkbfreereadbuf...@base 0 1 + (optional)_xkbgetatomnamef...@base 0 1 + (optional)_xkbgetchar...@base 0 1 + (optional)_xkbgetconvert...@base 0 1 + (optional)_xkbgetreadbuffercountedstr...@base 0 1 + (optional)_xkbgetreadbuffer...@base 0 1 + (optional)_xkbinitreadbuf...@base 0 1 + (optional)_xkbinternatomf...@base 0 1 + (optional)_xkbnotecoremapchan...@base 0 1 + (optional)_xkbpeekatreadbuf...@base 0 1 + (optional)_xkbreadbuffercopykeys...@base 0 1 + (optional)_xkbreadcopykeys...@base 0 1 + (optional)_xkbreadgetcompatmapre...@base 0 1 + (optional)_xkbreadgetgeometryre...@base 0 1 + (optional)_xkbreadgetindicatormapre...@base 0 1 + (optional)_xkbreadgetmapre...@base 0 1 + (optional)_xkbreadgetnamesre...@base 0 1 + (optional)_xkbreload...@base 0 1 + (optional)_xkbskipreadbufferd...@base 0 1 + (optional)_xkbwritecopykeys...@base 0 1 (optional)_xkeyta...@base 0 1 (optional)_xlcad...@base 0 1 (optional)_xlcaddchar...@base 0 1 commit 9da7e230d5320e1556ad2084fcd06ee7994385ea Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Wed Aug 5 14:15:02 2009 +1000 Bump to 1.2.99.901 (1.3 RC1) Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 265b86b..45e9d74 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.2.99.1, + 1.2.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) commit 8f78c7b4e3570cd46c5a220982963c17fe2157b8 Author: Filippo Giunchedi <fili...@debian.org> Date: Sat Jun 6 16:56:54 2009 +0200 nls: add {left,right}wards arrow to compose table Debian bug#532117 <http://bugs.debian.org/532117> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 26084b9..a4174bb 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -4150,6 +4150,8 @@ XCOMM Part 3 <Multi_key> <KP_Divide> <rightarrow> : "↛" U219B # RIGHTWARDS ARROW WITH STROKE <Multi_key> <slash> <U2194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE <Multi_key> <KP_Divide> <U2194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE +<Multi_key> <less> <minus> : "←" U2190 # LEFTWARDS ARROW +<Multi_key> <minus> <greater> : "→" U2192 # RIGHTWARDS ARROW <Multi_key> <U2203> <U0338> : "∄" U2204 # THERE DOES NOT EXIST <Multi_key> <U2208> <U0338> : "∉" U2209 # NOT AN ELEMENT OF <Multi_key> <U220B> <U0338> : "∌" U220C # DOES NOT CONTAIN AS MEMBER commit 7949bfa00390241d994f32463e50d4bd78920568 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jul 31 13:33:52 2009 +0200 Update library version for new symbols Commit 554f755e5545f63d3c8f299297927238da155773 added generic event cookie handling. Bump libX11 version number accordingly. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/Makefile.am b/src/Makefile.am index 774aa5a..26d8e27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -376,7 +376,7 @@ if XKB USE_XKB_LIBS = $(XKB_LIBS) endif -libX11_la_LDFLAGS = -version-number 6:2:0 -no-undefined +libX11_la_LDFLAGS = -version-number 6:3:0 -no-undefined libX11_la_LIBADD = \ $(USE_I18N_LIBS) \ commit 640fec5f4feacd01a00eea3dcd4edb220907d3dc Author: Julien Cristau <jcris...@debian.org> Date: Sun Aug 2 17:18:31 2009 +0200 Add _XFUNCPROTOBEGIN/END to Xlib-xcb.h X.Org bug#22252 <https://bugs.freedesktop.org/show_bug.cgi?id=22252> Reported-by: Riku Salminen <rsalm...@cc.hut.fi> Signed-off-by: Julien Cristau <jcris...@debian.org> diff --git a/include/X11/Xlib-xcb.h b/include/X11/Xlib-xcb.h index b88e2e7..03d8f98 100644 --- a/include/X11/Xlib-xcb.h +++ b/include/X11/Xlib-xcb.h @@ -6,10 +6,15 @@ #include <xcb/xcb.h> #include <X11/Xlib.h> +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN xcb_connection_t *XGetXCBConnection(Display *dpy); enum XEventQueueOwner { XlibOwnsEventQueue = 0, XCBOwnsEventQueue }; void XSetEventQueueOwner(Display *dpy, enum XEventQueueOwner owner); +_XFUNCPROTOEND + #endif /* XLIB_XCB_H */ commit 1ef711f2cba15d6a1305a2be4fda872956404c86 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jul 31 05:49:39 2009 +0200 Add tentative symbols file for libX11.so.6. Many private symbols still included. diff --git a/debian/changelog b/debian/changelog index 2075baf..f7f7f7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ libx11 (2:1.2.2-2) UNRELEASED; urgency=low [ Julien Cristau ] * Drop 002_arm_abi_brain_damage.diff, the old ABI arm port is gone. * Use a glob in libx11-6.install. + * Add tentative symbols file for libX11.so.6. Many private symbols still + included. -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 22:32:52 +0200 diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols new file mode 100644 index 0000000..6340a8a --- /dev/null +++ b/debian/libx11-6.symbols @@ -0,0 +1,1164 @@ +libX11.so.6 libx11-6 #MINVER# +| libx11-private + (optional)keysymtou...@base 0 1 + xactivatescreensa...@base 0 + xaddconnectionwa...@base 0 + xaddextens...@base 0 + xaddh...@base 0 + xaddho...@base 0 + xaddpi...@base 0 + xaddtoextensionl...@base 0 + xaddtosave...@base 0 + xallpla...@base 0 + xallocclassh...@base 0 + xallocco...@base 0 + xalloccolorce...@base 0 + xalloccolorpla...@base 0 + xallocicons...@base 0 + xallocnamedco...@base 0 + xallocsizehi...@base 0 + xallocstandardcolor...@base 0 + xallocwmhi...@base 0 + xalloweve...@base 0 + xautorepeat...@base 0 + xautorepea...@base 0 + xbasefontnamelistoffont...@base 0 + xb...@base 0 + xbitmapbitor...@base 0 + xbitmap...@base 0 + xbitmapu...@base 0 + xblackpi...@base 0 + xblackpixelofscr...@base 0 + xcellsofscr...@base 0 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org