libx11: Changes to 'debian-unstable'
ChangeLog | 494 +++++++++
configure.ac | 4
debian/changelog | 8
include/X11/Xregion.h | 7
modules/im/ximcp/imCallbk.c | 17
modules/im/ximcp/imDefIc.c | 79 +
modules/im/ximcp/imDefIm.c | 40
modules/im/ximcp/imDefLkup.c | 33
modules/im/ximcp/imDispch.c | 2
modules/im/ximcp/imExten.c | 6
modules/im/ximcp/imInsClbk.c | 2
modules/im/ximcp/imInt.c | 4
modules/im/ximcp/imLcIc.c | 2
modules/im/ximcp/imLcIm.c | 2
modules/im/ximcp/imLcPrs.c | 35
modules/im/ximcp/imRm.c | 60 -
modules/im/ximcp/imRmAttr.c | 12
modules/im/ximcp/imThaiIc.c | 10
modules/im/ximcp/imThaiIm.c | 2
modules/im/ximcp/imTrX.c | 2
modules/im/ximcp/imTrans.c | 10
modules/im/ximcp/imTransR.c | 8
modules/lc/def/lcDefConv.c | 8
modules/lc/gen/lcGenConv.c | 28
modules/lc/xlocale/lcEuc.c | 4
modules/lc/xlocale/lcJis.c | 8
modules/lc/xlocale/lcSjis.c | 4
modules/om/generic/omGeneric.c | 57 -
nls/en_US.UTF-8/Compose.pre | 8
src/Context.c | 12
src/FetchName.c | 4
src/Font.c | 66 -
src/FontInfo.c | 18
src/FontNames.c | 4
src/FreeEData.c | 4
src/FreeGC.c | 2
src/GetFPath.c | 4
src/GetHints.c | 24
src/GetNrmHint.c | 4
src/GetRGBCMap.c | 10
src/GetStCmap.c | 6
src/GetWMCMapW.c | 2
src/GetWMProto.c | 2
src/ImUtil.c | 8
src/InitExt.c | 2
src/IntAtom.c | 6
src/KeyBind.c | 12
src/ListExt.c | 6
src/Makefile.am | 5
src/ModMap.c | 8
src/OpenDis.c | 20
src/PolyReg.c | 6
src/PutImage.c | 6
src/QuColors.c | 2
src/Quarks.c | 2
src/RdBitF.c | 4
src/Region.c | 28
src/RegstFlt.c | 4
src/SetFPath.c | 2
src/SetHints.c | 2
src/SetRGBCMap.c | 2
src/StBytes.c | 2
src/TextToStr.c | 4
src/VisUtil.c | 4
src/Xrm.c | 28
src/locking.c | 12
src/udcInf.c | 715 --------------
src/util/Makefile.am | 4
src/xcms/CCC.c | 5
src/xcms/CvCols.c | 6
src/xcms/IdOfPr.c | 2
src/xcms/LRGB.c | 36
src/xcms/SetGetCols.c | 10
src/xcms/StCols.c | 4
src/xcms/cmsCmap.c | 11
src/xcms/cmsColNm.c | 8
src/xcms/cmsInt.c | 11
src/xkb/XKB.c | 766 +++++++--------
src/xkb/XKBAlloc.c | 642 ++++++------
src/xkb/XKBBell.c | 123 +-
src/xkb/XKBBind.c | 1080 +++++++++++----------
src/xkb/XKBCompat.c | 295 +++--
src/xkb/XKBCtrls.c | 347 +++---
src/xkb/XKBCvt.c | 294 +++--
src/xkb/XKBExtDev.c | 1180 ++++++++++++-----------
src/xkb/XKBGAlloc.c | 1206 ++++++++++++------------
src/xkb/XKBGeom.c | 1042 ++++++++++----------
src/xkb/XKBGetByName.c | 286 ++---
src/xkb/XKBGetMap.c | 1101 +++++++++++-----------
src/xkb/XKBList.c | 333 +++---
src/xkb/XKBMAlloc.c | 1646 ++++++++++++++++-----------------
src/xkb/XKBMisc.c | 1640 +++++++++++++++++---------------
src/xkb/XKBNames.c | 1397 ++++++++++++++--------------
src/xkb/XKBRdBuf.c | 173 +--
src/xkb/XKBSetGeom.c | 606 ++++++------
src/xkb/XKBSetMap.c | 769 +++++++--------
src/xkb/XKBUse.c | 1363 +++++++++++++--------------
src/xkb/XKBleds.c | 377 +++----
src/xkb/XKBlibint.h | 362 +++----
src/xlibi18n/ICWrap.c | 14
src/xlibi18n/IMWrap.c | 2
src/xlibi18n/XDefaultIMIF.c | 12
src/xlibi18n/XDefaultOMIF.c | 33
src/xlibi18n/XlcDL.c | 29
src/xlibi18n/XlcPubI.h | 4
src/xlibi18n/lcCT.c | 18
src/xlibi18n/lcCharSet.c | 10
src/xlibi18n/lcConv.c | 10
src/xlibi18n/lcDB.c | 29
src/xlibi18n/lcDynamic.c | 4
src/xlibi18n/lcFile.c | 146 +-
src/xlibi18n/lcGeneric.c | 89 -
src/xlibi18n/lcPrTxt.c | 10
src/xlibi18n/lcPubWrap.c | 2
src/xlibi18n/lcPublic.c | 5
src/xlibi18n/lcRM.c | 10
src/xlibi18n/lcTxtPr.c | 4
src/xlibi18n/lcUTF8.c | 20
src/xlibi18n/lcUniConv/8bit_tab_to_h.c | 6
src/xlibi18n/lcUniConv/cjk_tab_to_h.c | 14
src/xlibi18n/lcWrap.c | 16
src/xlibi18n/mbWMProps.c | 4
src/xlibi18n/mbWrap.c | 12
src/xlibi18n/utf8WMProps.c | 4
src/xlibi18n/utf8Wrap.c | 12
125 files changed, 9901 insertions(+), 9751 deletions(-)
New commits:
commit e908ec3265485f4a65a82dfbe874498381d1ab91
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Oct 3 09:47:17 2013 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 33882d4..708da63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.6.2-1) UNRELEASED; urgency=low
+libx11 (2:1.6.2-1) unstable; urgency=low
[ Julien Cristau ]
* So apparently the 64-bit powerpc port is called ppc64 (closes: #613820).
@@ -6,7 +6,7 @@ libx11 (2:1.6.2-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- -- Julien Cristau <jcristau@debian.org> Tue, 13 Aug 2013 16:18:44 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 03 Oct 2013 09:46:46 +0200
libx11 (2:1.6.1-1) unstable; urgency=low
commit 42678d7b821a1e897c76ddbcdfedc991592b4ea4
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Oct 3 09:46:28 2013 +0200
New upstream release.
diff --git a/ChangeLog b/ChangeLog
index 70cae39..5cbc9e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,497 @@
+commit 18a5278b008e9faa59b346fcab18a8d74b875fda
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Sep 28 17:33:52 2013 -0400
+
+ makekeys: don't need to use target-specific CFLAGS
+
+ It's the only thing built in that directory, so we can use AM_CFLAGS
+ and AM_CPPFLAGS as usual.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Sep 17 12:50:42 2013 -0400
+
+ nls/en_US.UTF-8/Compose.pre: Fix typo.
+
+ Fix typo added in 215ce6a67863, s/actute/acute/.
+
+ Fixes bug #69476. Reported by Jean Krohn.
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit cb107760df33ffc8630677e66e2e50aa37950a5c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 8 18:37:01 2013 -0700
+
+ libX11 1.6.2
+
+commit 215ce6a67863de7acfd6dd3562b4fd97ef87b411
+Author: Benno Schulenberg <bensberg@justemail.net>
+Date: Sun Sep 1 12:38:30 2013 +0200
+
+ nls: Adding more accessible compose sequences for J́ and j́.
+
+ Few keyboards have an <acute> key, so this adds the much more
+ accessible and usual compose sequences with <apostrophe>, ánd
+ the most comfortable ones with <dead_acute>.
+
+ Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit e9b14d10d0258bfcc273ff8bc84cd349dccda62c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 24 17:27:43 2013 -0700
+
+ Bug 68413 - [Bisected]Error in `xterm': realloc(): invalid next size
+
+ Pass *new* size to realloc, not old size.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c2b8e30790c21d6386767265263b3294ce1b1f9a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 16 21:04:02 2013 -0700
+
+ Stop checking for HAVE_DIX_CONFIG_H on the client side
+
+ Leftover from when these XKB files were shared with the server sources
+ and could be compiled in either the client or server, with the different
+ autoconf config files in each.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 84276609b2f0aec74fb464c428c7db5714b0fcfc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 16 18:27:28 2013 -0700
+
+ Rearrange some variable declarations & initializations in XKB
+
+ Little things noticed during XKB restyling that seemed to make the
+ code easier to read.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b90b7e859cf45ec76921fa21bbfc1f3840d6e8d1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Aug 11 13:29:33 2013 -0700
+
+ Reindent XKB code to X.Org standard style
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c0a0f78eb49c2e4ad956209de77475c85b9314ea
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 16 18:14:14 2013 -0700
+
+ Fix overflow checks in _XkbReadKeySyms when key_sym_map is already created
+
+ We were checking to make sure that the largest keysym value was within
+ the range of the allocated buffer, but checking against different limits
+ in the not-yet-allocated vs. the already-allocated branches.
+
+ The check should be the same in both, and reflect the size used for the
+ allocation, which is based on the maximum key code value, so we move it
+ to be a common check, before we branch, instead of duplicating in each
+ branch.
+
+ map->key_sym_map is an array of XkbSymMapRec structs, [0..max_key_code]
+ map->syms is the array for which num_syms is recorded, hence is not the
+ right value to check for ensuring our key_sym_map accesses are in range.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reported-by: Barry Kauler <bkauler@gmail.com>
+ Tested-by: Barry Kauler <bkauler@gmail.com>
+
+commit bea6cbd027973142fc64532274e1d16861b47190
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Aug 11 17:02:21 2013 -0700
+
+ Remove long unused src/udcInf.c
+
+ I can find no record of what this file was for. Neither the X11R6.8.2
+ monolith Imakefile nor any modular release Makefile.am have ever built
+ it and nothing else references it.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bf3501e0395abe890acfea98fdd9f50a6966f118
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Aug 11 00:07:33 2013 -0700
+
+ Remove unnecessary casts of pointers to (char *) in calls to Xfree()
+
+ Left one cast behind that is necessary to change from const char *
+ to char * in src/xlibi18n/lcCharSet.c.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6ead9dd92ab90aabd9f0e328d59597e6b5bc09d3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 23:57:55 2013 -0700
+
+ Don't cast sizeof() results to unsigned when passing to Xmalloc/Xcalloc
+
+ sizeof() returns size_t, malloc() & calloc() expect sizes in size_t,
+ don't strip down to unsigned int and re-expand unnecessarily.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 25a7a329def672fc8d26078538173777850c6390
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 23:51:08 2013 -0700
+
+ Remove even more casts of return values from Xmalloc/Xrealloc
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f8fa16092a148b74ca35b4beb182053352606f2f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 23:05:13 2013 -0700
+
+ xlibi18n: fix argsize argument to _XlcParsePath
+
+ The array is defined as having NUM_LOCALEDIR entries, so use that
+ instead of hardcoded 256 value (the other two calls already did this).
+
+ Reported by parfait:
+ Buffer overflow (CWE 120): In pointer dereference of argv[argc] with index argc
+ Pointer size is 64 elements (of 8 bytes each), index is 255
+ at line 82 of src/xlibi18n/lcFile.c in function 'parse_line'.
+ called at line 178 in function '_XlcParsePath' with argv = argv.
+ called at line 722 in function '_XlcLocaleLibDirName' with argv = args, argsize = 256.
+ at line 82 of src/xlibi18n/lcFile.c in function 'parse_line'.
+ called at line 178 in function '_XlcParsePath' with argv = argv.
+ called at line 638 in function '_XlcLocaleDirName' with argv = args, argsize = 256.
+
+ [ This bug was found by the Parfait 1.2.0 bug checking tool.
+ http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e7d46c6452c0b90fd66ae9f538546b968e0dd608
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 22:32:42 2013 -0700
+
+ i18n modules: Fix some const cast warnings
+
+ imRm.c: In function '_XimSetICMode':
+ imRm.c:2419:37: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+ imRm.c:2420:30: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+
+ lcGenConv.c: In function 'byteM_parse_codeset':
+ lcGenConv.c:345:13: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cbd86eccf175dc82a5cbcea54c8bd21ce18b70c0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 22:21:54 2013 -0700
+
+ xlibi18n: Fix a bunch of const cast warnings
+
+ Add const qualifiers to casts where needed, remove other casts that
+ are no longer needed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eb3676113fc2dd0f34d92b89beb81b3f61569aa1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 22:18:00 2013 -0700
+
+ Fix const handling in XSetLocaleModifiers
+
+ Instead of reusing the input parameter to store the output, make a
+ result variable instead, so that there's less const confusion.
+
+ Fixes gcc warnings:
+ lcWrap.c: In function 'XSetLocaleModifiers':
+ lcWrap.c:87:18: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+ lcWrap.c:91:25: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+ lcWrap.c:93:12: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8ebbffa98563960910152e4f2e31cb032375d871
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 21:46:37 2013 -0700
+
+ Constify lc_name argument to _XlcLocaleDirName() & _XlcLocaleLibDirName()
+
+ Makes code considerably less crufty and clears gcc warnings:
+ XlcDL.c: In function '_XlcDynamicLoad':
+ XlcDL.c:384:44: warning: cast discards '__attribute__((const))' qualifier
+ from pointer target type [-Wcast-qual]
+ XlcDL.c:386:51: warning: cast discards '__attribute__((const))' qualifier
+ from pointer target type [-Wcast-qual]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 07e4e864107b38c2f393564fdacc90f4e858f23f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 13:37:53 2013 -0700
+
+ init_om: remove unneeded extra copy of string to local buffer
+
+ Strings from the supported_charset_list[] were being copied one by
+ one to a stack buffer, and then strdup called on that buffer.
+
+ Instead, just strdup the original string, without the local copy,
+ and use a more traditional for loop, so it's easier to figure out
+ what the code is doing (cleaning up a gcc const-cast warning in
+ the process).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 1cec14dad904ba21a861f4af131be5982ecb83dd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 12:34:53 2013 -0700
+
+ Delete unused XKB_INSURE_SIZE macro from XKBlibint.h
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 5f32182c7c4045540ff3833c48ee24a3a25726e2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 12:19:17 2013 -0700
+
+ miRegionOp(): ensure region size is not updated if realloc fails
+
+ This function performs operations on a region, and when finished,
+ checks to see if it should compact the rectangle list. If the
+ number of rectangles for which memory is allocated in the list is
+ more than twice the number used, it tries to shrink. realloc()
+ should not fail in this case, but if it does, might as well keep
+ the correct value for the number of allocated rectangles, so we
+ don't try to grow it unnecessarily later if adding to the region.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bd2a0b5a187798bb2e2f05dc5062ca79e37075dd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 12:19:17 2013 -0700
+
+ miRegionCopy(): handle realloc failure better
+
+ Zero out the region size when freeing the region so callers don't think
+ there's anything there. (Pointer is already set to NULL from the realloc
+ result itself.) Return 0 to the callers, and have them cascade that back
+ to their callers to indicate failure, instead of their usual return value
+ of 1 on success.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5dc8b5385d513bbda88697c2372db750d23f46d4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 11:27:22 2013 -0700
+
+ Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macro
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 453c4ee436ef32d91501d7736d7a91c1aeafc565
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 12:07:51 2013 -0700
+
+ Avoid memory leak/corruption if realloc fails in imLcPrs.c:parseline()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b3fea74ec5b7d4f83755a52a8d49c564b71c6d12
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 12:30:39 2013 -0700
+
+ lcDB.c: ensure buffer size is updated correctly if realloc fails
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 43bb822c714a73c3b2d15e621ffb3333cd10da8c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Aug 10 11:07:47 2013 -0700
+
+ Avoid memory leak/corruption if realloc fails in XlcDL.c:resolve_object()
+
+ Previously, if realloc failed to increase the size, we'd still
+ record that we had allocated the larger size, but the pointer
+ to it would be NULL, causing future calls to be broken, and the
+ previous allocation to be lost/leaked.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 5d47a39978e92bb34ec928b1b15d71c0c2434870
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 9 23:33:03 2013 -0700
+
+ omGeneric.c: convert sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 88a27a2aa9b7d35cb79b16334ea3413e572b724a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 9 23:30:30 2013 -0700
+
+ ximcp/imRm.c: convert sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 4fadae243fb485628c9a137f5da3489ed6214b21
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 9 23:02:12 2013 -0700
+
+ xlibi18n: convert sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 36a7edf0e5edfc5ef4ff2c3a8b4fa3dc4796e854
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 9 23:02:12 2013 -0700
+
+ lcfile: skip over any null entries in args list
+
+ Previous code seemed to assume that printf("%s", NULL) would result
+ in a 0-length string, not "(null)" or similar, but since there's no
+ point looking for files in "(null)/filepath...", instead we just
+ skip over NULL entries in search paths when generating file names.
+
+ In the *DirName() functions, this effectively just moves the "bail on
+ NULL in arg[i]" check up from the later code that assigned it to targetdir
+ and then bailed if that was NULL.
+
+ Not sure how there ever could be a NULL in arg[i], given the current
+ implementation of XlcParsePath, but it's easy enough to check once and
+ reject up front instead of on every reference.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ee0824f24392d5ca3d5fd5f5ed8d78c0d892f7c0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 9 22:00:09 2013 -0700
+
+ Fix file leak on malloc error in XlcDL.c:resolve_object()
+
+ File Leak: Leaked File fp
+ at line 219 of lib/libX11/src/xlibi18n/XlcDL.c in function 'resolve_object'.
+ fp initialized at line 198 with fopen
+
+ [ This bug was found by the Parfait 1.2.0 bug checking tool.
+ http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 9b291044a240e5b9b031ed814e0c84e53a1c3084
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sat Jun 15 18:02:21 2013 +0200
+
+ Add missing locales to configure.ac
+
+ Commits 40761898692e5063957bfa2518cca3d35b2e354a and
+ f198c6aa98f88ff285d903175a3c4c0fd33a4575 added two new locales
+ (sr_CS.UTF-8 and km_KH.UTF-8), but didn't list them in configure.ac,
+ meaning they're not included in tarballs.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 8f58e54a5f46c3cd4897a23b89950f4800ae38d4
+Author: ISHIKAWA,chiaki <ishikawa@yk.rim.or.jp>
+Date: Tue Dec 18 15:28:05 2012 +0000
+
+ Fix bogus timestamp generated by XIM
+
+ Fix bogus timestamp generted by XIM due to uninitialized
+ data field. Also set appropriate serial, too.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=39367
+
+ Signed-off-by: Chiaki ISHIKAWA <ishikawa@yk.rim.or.jp>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e7fd6f0eda57300df4d6b695b7064610ca5dec57
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Thu Jun 16 18:47:49 2011 +0200
+
+ XIM: Fix sync problem on focus change.
+
+ XSetICFocus() and XUnsetICFocus() are both asynchronous events.
+ This is a pretty stupid idea: those functions may undo certain
+ settings on the client side for which requests from the server
+ may still be in the queue unprocessed. Thus things may be set
+ in the wrong order ie instead of set -> unest it will be unset -> set.
+ Moreover there is no way for either the client or the server to
+ cause the event queue to be flushed - which is pretty bad as
+ XIM is bidirectional.
+ The scenario is as follows:
+ Two ICs are created:
+ ic1 = XCreateIC(im,
+ XNInputStyle, XIMPreeditCallbacks | XIMStatusCallbacks,
+ XNClientWindow, window,
+ XNPreeditAttributes, preedit_attr,
+ XNStatusAttributes, status_attr,
+ NULL);
+ ic2 = XCreateIC(im, XNInputStyle,
+ XIMPreeditNothing | XIMStatusNothing,
+ XNClientWindow, window, NULL);
+ Then the focus is removed from ic2:
+ XUnsetICFocus(ic2);
+ If SCIM is used as the input server it will send a bunch of requests
+ following an XCreateIC(). One of the requests registers a key release
+ filter. XUnsetICFocus() unsets both key press and release filters.
+ Since it is asynchronous, the input server requests to register key
+ press and release filters may not have been processed, when XUnsetICFocus()
+ is called. Since there is no explicite way for client programs to enforce
+ the request queue to be flushed explicitely before an X[Set/Unset]ICFocus()
+ call it would be safest to make those two calls synchronous in the sense
+ that they ensure the request queue has been handled before they execute.
+ The easiest way to do this from Xlib is thru a call to XGetICValues()
+ which sends a request to the server and subsequently reads the queue
+ from the server to the client. This will cause all outstanding requests
+ in the queue to be read and handled.
+ This is an ugly hack and this could be fixed directly in the client,
+ however it seems to be easier to fix Xlib than to fix numerous clients.
+ This problem arose since there is no well documented way how to handle
+ and synchronize XIM requests and not all input servers send requests
+ when an IC is created.
+ This has been discussed extensively in:
+ https://bugzilla.novell.com/show_bug.cgi?id=221326
+
+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
+
+commit 26ec7d3821bc19debc73c8c3e42e6e33ef6f856e
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Thu Jun 16 17:28:39 2011 +0200
+
+ XIM: Fix race on focus change: set 'FABRICATED' only when keyev filters in place.
+
+ When synthesized key events are sent on commit XIM sets the 'fabricated'
+ flag so that the keypress handler knows that these were not real events.
+ This also happens when committing due to the loss of focus. However in this
+ case the keypress/release filters which consume and unset this flag are no
+ longer in the filter chain.
+ So the flag is erronously set when a real keyboard event is received after
+ focus has been regained. So the first event is wrongly treated as a
+ fabricated key in the keypress handler which will at the same time reset
+ the flag so the second key event is treated correctly.
+ This fix only sets the flag when at least one of the keyboard filters is in
+ place.
+ How to reproduce this bug: run scim, choose a Japanese input method start
+ two instances of xterm: start typing in one xterm (this should pop up an
+ IM window). Without comitting (hitting 'enter') move focus to the other
+ xterm, then move focus back. Start typing again. The first character will
+ be committed immediately without popping up an input window.
+ With this fix this behavior is gone.
+
+ See also: https://bugzilla.novell.com/show_bug.cgi?id=239698
+
+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
+
commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 29 21:29:49 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index f25f145..33882d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-libx11 (2:1.6.1-2) UNRELEASED; urgency=low
+libx11 (2:1.6.2-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* So apparently the 64-bit powerpc port is called ppc64 (closes: #613820).
+ [ Maarten Lankhorst ]
+ * New upstream release.
+
-- Julien Cristau <jcristau@debian.org> Tue, 13 Aug 2013 16:18:44 +0200
libx11 (2:1.6.1-1) unstable; urgency=low
commit 18a5278b008e9faa59b346fcab18a8d74b875fda
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 17:33:52 2013 -0400
makekeys: don't need to use target-specific CFLAGS
It's the only thing built in that directory, so we can use AM_CFLAGS
and AM_CPPFLAGS as usual.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index dfe91f1..79962d4 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,11 +1,11 @@
noinst_PROGRAMS=makekeys
-makekeys_CFLAGS = \
+AM_CFLAGS = \
$(X11_CFLAGS) \
$(CWARNFLAGS)
-makekeys_CPPFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include
CC = @CC_FOR_BUILD@
commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Sep 17 12:50:42 2013 -0400
nls/en_US.UTF-8/Compose.pre: Fix typo.
Fix typo added in 215ce6a67863, s/actute/acute/.
Fixes bug #69476. Reported by Jean Krohn.
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index a741332..7314d7f 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -743,7 +743,7 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
commit cb107760df33ffc8630677e66e2e50aa37950a5c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 8 18:37:01 2013 -0700
libX11 1.6.2
diff --git a/configure.ac b/configure.ac
index 33613dd..8ad1f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.1],
+AC_INIT([libX11], [1.6.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit 215ce6a67863de7acfd6dd3562b4fd97ef87b411
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sun Sep 1 12:38:30 2013 +0200
nls: Adding more accessible compose sequences for J́ and j́.
Few keyboards have an <acute> key, so this adds the much more
accessible and usual compose sequences with <apostrophe>, ánd
the most comfortable ones with <dead_acute>.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index ab82376..a741332 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -618,6 +618,10 @@ XCOMM Part 3
<Multi_key> <I> <quotedbl> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <I> <diaeresis> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
+<dead_acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <apostrophe> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <J> <apostrophe> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
<Multi_key> <J> <acute> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
<Multi_key> <D> <H> : "Ð" ETH # LATIN CAPITAL LETTER ETH
<dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
@@ -739,6 +743,10 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <acute> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <d> <h> : "ð" eth # LATIN SMALL LETTER ETH
<dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
commit e9b14d10d0258bfcc273ff8bc84cd349dccda62c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Aug 24 17:27:43 2013 -0700
Bug 68413 - [Bisected]Error in `xterm': realloc(): invalid next size
Pass *new* size to realloc, not old size.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index 34cfcad..e9d5f7b 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -644,7 +644,7 @@ parseline(
}
while (b->utf8used + l + 1 > b->utf8size) {
DTCharIndex newsize = b->utf8size ? b->utf8size * 1.5 : 1024;
- char *newutf8 = Xrealloc (b->utf8, b->utf8size);
+ char *newutf8 = Xrealloc (b->utf8, newsize);
if (newutf8 == NULL)
goto error;
b->utf8 = newutf8;
commit c2b8e30790c21d6386767265263b3294ce1b1f9a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 16 21:04:02 2013 -0700
Stop checking for HAVE_DIX_CONFIG_H on the client side
Leftover from when these XKB files were shared with the server sources
and could be compiled in either the client or server, with the different
autoconf config files in each.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index aa6f632..5cfef0f 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 5ea91b9..63bb2db 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/XKBGAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
index 3b75dae..f27fe4e 100644
--- a/src/xkb/XKBMAlloc.c
+++ b/src/xkb/XKBMAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
index 166842f..a6c916c 100644
--- a/src/xkb/XKBMisc.c
+++ b/src/xkb/XKBMisc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
commit 84276609b2f0aec74fb464c428c7db5714b0fcfc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 16 18:27:28 2013 -0700
Rearrange some variable declarations & initializations in XKB
Little things noticed during XKB restyling that seemed to make the
code easier to read.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index 3693c9b..aa6f632 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -132,9 +132,8 @@ XkbAllocNames(XkbDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases)
if ((which & XkbKTLevelNamesMask) && (xkb->map != NULL) &&
(xkb->map->types != NULL)) {
register int i;
- XkbKeyTypePtr type;
+ XkbKeyTypePtr type = xkb->map->types;
- type = xkb->map->types;
for (i = 0; i < xkb->map->num_types; i++, type++) {
if (type->level_names == NULL) {
type->level_names = _XkbTypedCalloc(type->num_levels, Atom);
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index f520b18..29870b5 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -450,23 +450,24 @@ XRefreshKeyboardMapping(register XMappingEvent * event)
fprintf(stderr, " symbols: %d..%d\n", first, last);
}
if (changes.changed & XkbKeyActionsMask) {
- int last, first = changes.first_key_act;
+ int first = changes.first_key_act;
+ int last = changes.first_key_act + changes.num_key_acts - 1;
- last = changes.first_key_act + changes.num_key_acts - 1;
fprintf(stderr, " acts: %d..%d\n", first, last);
}
if (changes.changed & XkbKeyBehaviorsMask) {
- int last, first = changes.first_key_behavior;
- last = first + changes.num_key_behaviors - 1;
+ int first = changes.first_key_behavior;
+ int last = first + changes.num_key_behaviors - 1;
+
fprintf(stderr, " behaviors: %d..%d\n", first, last);
}
if (changes.changed & XkbVirtualModsMask) {
fprintf(stderr, "virtual mods: 0x%04x\n", changes.vmods);
}
if (changes.changed & XkbExplicitComponentsMask) {
- int last, first = changes.first_key_explicit;
+ int first = changes.first_key_explicit;
+ int last = first + changes.num_key_explicit - 1;
- last = first + changes.num_key_explicit - 1;
fprintf(stderr, " explicit: %d..%d\n", first, last);
}
#endif
@@ -643,10 +644,9 @@ XkbTranslateKeySym(register Display *dpy,
if ((!xkb->cvt.KSToUpper) && (mods & LockMask)) {
register int i;
int change;
- char ch;
for (i = change = 0; i < n; i++) {
- ch = toupper(buffer[i]);
+ char ch = toupper(buffer[i]);
change = (change || (buffer[i] != ch));
buffer[i] = ch;
}
diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c
index 1dcad49..227791b 100644
--- a/src/xkb/XKBCompat.c
+++ b/src/xkb/XKBCompat.c
@@ -195,9 +195,8 @@ _XkbWriteSetCompatMap(Display *dpy, xkbSetCompatMapReq *req, XkbDescPtr xkb)
buf += nSI * SIZEOF(xkbSymInterpretWireDesc);
}
if (groups & XkbAllGroupsMask) {
- xkbModsWireDesc *out;
+ xkbModsWireDesc *out = (xkbModsWireDesc *) buf;
- out = (xkbModsWireDesc *) buf;
for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) {
if ((groups & bit) != 0) {
out->mask = xkb->compat->groups[i].mask;
diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
index b111364..4065dcd 100644
--- a/src/xkb/XKBExtDev.c
+++ b/src/xkb/XKBExtDev.c
@@ -68,9 +68,8 @@ XkbNoteDeviceChanges(XkbDeviceChangesPtr old,
XkbDeviceLedChangesPtr this;
if (old->changed & XkbXI_IndicatorsMask) {
- XkbDeviceLedChangesPtr found;
+ XkbDeviceLedChangesPtr found = NULL;
- found = NULL;
for (this = &old->leds; this && (!found); this = this->next) {
if ((this->led_class == new->led_class) &&
(this->led_id == new->led_id)) {
@@ -607,9 +606,8 @@ _XkbWriteLedInfo(char *wire, unsigned changed, XkbDeviceLedInfoPtr devli)
lwire->state = devli->state;
wire = (char *) &lwire[1];
Reply to: