libX11: Changes to 'master'

[GitLab Mirror]

 configure.ac               |    2 +-
 include/X11/Xlibint.h      |   13 ++-----------
 modules/im/ximcp/imDefIm.c |    4 ++--
 modules/lc/gen/lcGenConv.c |   10 +++++-----
 src/xcms/LRGB.c            |    2 +-
 src/xkb/XKBBind.c          |   14 ++++++++++++++
 src/xlibi18n/lcDB.c        |    2 +-
 src/xlibi18n/lcUTF8.c      |    2 +-
 8 files changed, 27 insertions(+), 22 deletions(-)

New commits:
commit d127217f26df1bf7566c1f372d8b5329a06754ea
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 16 17:03:24 2020 -0700

    Exempt XLookupKeysym from XKeycodeToKeysym deprecation warnings
    
    Gets rid of:
    src/xkb/XKBBind.c: In function ‘XLookupKeysym’:
    src/xkb/XKBBind.c:234:5: warning: ‘XKeycodeToKeysym’ is deprecated
    [https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Wdeprecated-declarations]
      234 |     return XKeycodeToKeysym(dpy, event->keycode, col);
          |     ^~~~~~
    src/xkb/XKBBind.c:96:1: note: declared here
       96 | XKeycodeToKeysym(Display *dpy,
          | ^~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit a64eb5f478c6ca84ef3457a01f9a7c3db8ecf1e5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 16 16:50:43 2020 -0700

    lcUTF8: Increase string buffer size from 20 to 32 bytes
    
    While we don't expect large enough ints to need it, we don't
    enforce a maximum size, so gcc assumes the worst and warns:
    
    ../../../src/xlibi18n/lcUTF8.c: In function ‘create_tofontcs_conv’:
    ../../../src/xlibi18n/lcUTF8.c:1736:34: warning: ‘.charset.name’ directive output may be truncated writing 13 bytes into a region of size between 8 and 17 [-Wformat-truncation=]
     1736 |  snprintf(buf, sizeof(buf), "fs%d.charset.name", i);
          |                                  ^~~~~~~~~~~~~
    ../../../src/xlibi18n/lcUTF8.c:1736:2: note: ‘snprintf’ output between 17 and 26 bytes into a destination of size 20
     1736 |  snprintf(buf, sizeof(buf), "fs%d.charset.name", i);
          |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../../../src/xlibi18n/lcUTF8.c:1739:46: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
     1739 |      snprintf(buf, sizeof(buf), "fs%d.charset", i);
          |                                              ^
    ../../../src/xlibi18n/lcUTF8.c:1739:6: note: ‘snprintf’ output between 12 and 21 bytes into a destination of size 20
     1739 |      snprintf(buf, sizeof(buf), "fs%d.charset", i);
          |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../../../src/xlibi18n/lcUTF8.c:1754:41: warning: ‘.charset.name’ directive output may be truncated writing 13 bytes into a region of size between 8 and 17 [-Wformat-truncation=]
     1754 |         snprintf(buf, sizeof(buf), "fs%d.charset.name", i);
          |                                         ^~~~~~~~~~~~~
    ../../../src/xlibi18n/lcUTF8.c:1754:9: note: ‘snprintf’ output between 17 and 26 bytes into a destination of size 20
     1754 |         snprintf(buf, sizeof(buf), "fs%d.charset.name", i);
          |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../../../src/xlibi18n/lcUTF8.c:1757:53: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
     1757 |             snprintf(buf, sizeof(buf), "fs%d.charset", i);
          |                                                     ^
    ../../../src/xlibi18n/lcUTF8.c:1757:13: note: ‘snprintf’ output between 12 and 21 bytes into a destination of size 20
     1757 |             snprintf(buf, sizeof(buf), "fs%d.charset", i);
          |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 54925250ad9c825bea671dcade5c913bad88abee
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 16 16:33:59 2020 -0700

    i18n: use memcpy instead of strncpy on unterminated char arrays
    
    Avoids gcc warnings that we're using strncpy wrong to copy a known-length
    set of characters without a terminating '\0' to a buffer whose length we
    are checking separately.  (Should also be imperceptibly faster since we
    no longer check if each byte is '\0' when we already know it won't be.)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 8754868dbbbc5fa096282df0504aa7880488eeb9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 16 16:02:01 2020 -0700

    Mark FreeBlueTblElements label unused in LRGB.c
    
    Quiets gcc 10.2 warning of:
    src/xcms/LRGB.c: In function ‘LINEAR_RGB_InitSCCData’:
    src/xcms/LRGB.c:798:1: warning: label ‘FreeBlueTblElements’ defined
     but not used
    [https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-label-Wunused-label]
      798 | FreeBlueTblElements:
          | ^~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 52b0cd67073f2f4665884b5a7decfedeb3b7ca1e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 16 14:54:47 2020 -0700

    Raise minimum required xproto version to 7.0.25 (released 2013-11-23)
    
    Allows us to depend on _X_COLD directly instead of having to check for it.
    
    (Since we also use _X_UNUSED, 7.0.22 or later was implicitly required
     already but not checked for.)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>