[gtk/gtk-3-24: 13/13] Merge branch 'gtk-3-24+emoji-data-update' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit eff4d45c09e81cf9a6e3f69a34365dcfa20cfe68
Merge: dc5fcd28fd 3177a3b42b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 14 00:42:04 2021 +0000

    Merge branch 'gtk-3-24+emoji-data-update' into 'gtk-3-24'
    
    Backport Emoji changes to share the same (and newer) emojibase data
    
    See merge request GNOME/gtk!3521

 gtk/Makefile.am               |    14 +-
 gtk/emoji/README.md           |    23 +
 gtk/emoji/convert-emoji.c     |   166 +-
 gtk/emoji/de.data             |   Bin 0 -> 131243 bytes
 gtk/emoji/emoji.data          |   Bin 55307 -> 0 bytes
 gtk/emoji/emoji.json          | 15740 ------------------
 gtk/emoji/emoji1.json         | 34181 ----------------------------------------
 gtk/emoji/en.data             |   Bin 0 -> 101455 bytes
 gtk/emoji/es.data             |   Bin 0 -> 117567 bytes
 gtk/emoji/fr.data             |   Bin 0 -> 106235 bytes
 gtk/emoji/gresource.xml.in    |     6 +
 gtk/emoji/zh.data             |   Bin 0 -> 96243 bytes
 gtk/gen-gtk-gresources-xml.py |     2 +-
 gtk/gtkemojichooser.c         |   261 +-
 gtk/gtkemojicompletion.c      |    20 +-
 gtk/gtkprivate.h              |     2 +
 gtk/meson.build               |    18 +
 win32/create-lists-msvc.mak   |     2 +-
 win32/generate-msvc.mak       |     2 +-
 19 files changed, 376 insertions(+), 50061 deletions(-)
---