libX11: Changes to 'master'

[Jeremy Huddleston]

This commit introduced a 'make check' failure due by duplicating existing entries:

make[2]: Entering directory `/home/jeremy/src/freedesktop/jhbuild/src/xorg/lib/libX11/nls'
Clash with existing sequence in en_US.UTF-8/Compose on line 5826: <Multi_key> <equal> <slash>
  line #5826: <Multi_key> <equal> <slash>                     : "≠"   U2260   # = / NOT EQUAL TO
  line #4533: <Multi_key> <equal> <slash>  	: "≠"   U2260 # NOT EQUAL TO
Clash with existing sequence in en_US.UTF-8/Compose on line 5827: <Multi_key> <slash> <equal>
  line #5827: <Multi_key> <slash> <equal>                     : "≠"   U2260   # / = NOT EQUAL TO
  line #4532: <Multi_key> <slash> <equal>  	: "≠"   U2260 # NOT EQUAL TO
Clash with existing sequence in en_US.UTF-8/Compose on line 5828: <Multi_key> <underscore> <equal>
  line #5828: <Multi_key> <underscore> <equal>                : "≡"   U2261   # _ = IDENTICAL TO
  line #4474: <Multi_key> <underscore> <equal> 	: "₌"   U208C # SUBSCRIPT EQUALS SIGN
Clash with existing sequence in en_US.UTF-8/Compose on line 5844: <Multi_key> <parenleft> <minus>
  line #5844: <Multi_key> <parenleft> <minus>                 : "⊢"   U22a2   # ( - RIGHT TACK
  line #73: <Multi_key> <parenleft> <minus>  	: "{"   braceleft # LEFT CURLY BRACKET
Clash with existing sequence in en_US.UTF-8/Compose on line 5845: <Multi_key> <minus> <parenleft>
  line #5845: <Multi_key> <minus> <parenleft>                 : "⊢"   U22a2   # - ( RIGHT TACK
  line #74: <Multi_key> <minus> <parenleft>  	: "{"   braceleft # LEFT CURLY BRACKET
Clash with existing sequence in en_US.UTF-8/Compose on line 5846: <Multi_key> <parenright> <minus>
  line #5846: <Multi_key> <parenright> <minus>                : "⊣"   U22a3   # ) - LEFT TACK
  line #83: <Multi_key> <parenright> <minus> 	: "}"   braceright # RIGHT CURLY BRACKET
Clash with existing sequence in en_US.UTF-8/Compose on line 5847: <Multi_key> <minus> <parenright>
  line #5847: <Multi_key> <minus> <parenright>                : "⊣"   U22a3   # - ) LEFT TACK
  line #84: <Multi_key> <minus> <parenright> 	: "}"   braceright # RIGHT CURLY BRACKET

make[2]: *** [check-TESTS] Error 1
make[1]: *** [check-am] Error 2
make: *** [check-recursive] Error 1

Clash with existing sequence in en_US.UTF-8/Compose on line 5929: <Multi_key> <apostrophe> <underscore>
  line #5929: <Multi_key> <apostrophe> <underscore>           : "⍘"   U2358   # ' _ APL FUNCTIONAL SYMBOL QUOTE UNDERBAR
  line #2041: <Multi_key> <apostrophe> <underscore> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
  line #2247: <Multi_key> <apostrophe> <underscore> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
  line #2029: <Multi_key> <apostrophe> <underscore> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
  line #2259: <Multi_key> <apostrophe> <underscore> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
Clash with existing sequence in en_US.UTF-8/Compose on line 5961: <Multi_key> <diaeresis> <asciitilde>
  line #5961: <Multi_key> <diaeresis> <asciitilde>            : "⍨"   U2368   # ¨ ~ APL FUNCTIONAL SYMBOL TILDE DIAERESIS
  line #4237: <Multi_key> <diaeresis> <asciitilde> 	: "῁"   U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
Clash with existing sequence in en_US.UTF-8/Compose on line 5965: <Multi_key> <comma> <minus>
  line #5965: <Multi_key> <comma> <minus>                     : "⍪"   U236a   # , - APL FUNCTIONAL SYMBOL COMMA BAR
  line #499: <Multi_key> <comma> <minus>      	: "¬"   notsign # NOT SIGN
Clash with existing sequence in en_US.UTF-8/Compose on line 5966: <Multi_key> <minus> <comma>
  line #5966: <Multi_key> <minus> <comma>                     : "⍪"   U236a   # - , APL FUNCTIONAL SYMBOL COMMA BAR
  line #500: <Multi_key> <minus> <comma>      	: "¬"   notsign # NOT SIGN
Clash with existing sequence in en_US.UTF-8/Compose on line 5977: <Multi_key> <underscore> <semicolon>
  line #5977: <Multi_key> <underscore> <semicolon>            : "⍮"   U236e   # _ ; APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR
  line #1405: <Multi_key> <underscore> <semicolon> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
  line #1414: <Multi_key> <underscore> <semicolon> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
FAIL: ./compose-check.pl
========================================================================
1 of 1 test failed
Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
========================================================================
make[2]: Leaving directory `/home/jeremy/src/freedesktop/jhbuild/src/xorg/lib/libX11/nls'
make[1]: Leaving directory `/home/jeremy/src/freedesktop/jhbuild/src/xorg/lib/libX11/nls'


On May 8, 2012, at 12:49 PM, James Cloos <cloos at kemper.freedesktop.org> wrote:

> nls/en_US.UTF-8/Compose.pre |  185 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 185 insertions(+)
> 
> New commits:
> commit e51e37c118ae6cb9ced8244ce1c410677e0279ce
> Author: Geoff Streeter <geoff at dyalog.com>
> Date:   Thu Mar 22 15:02:00 2012 +0000
> 
>    Add APL support to compose
> 
>    Signed-off-by: Geoff Streeter <geoff at dyalog.com>
>    Signed-off-by: James Cloos <cloos at jhcloos.com>
> 
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-commit
>