[gtk: 4/4] Merge branch 'wip/otte/for-master' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 9b71bbac3a601f9457d609f8e86236a842e41c5c
Merge: 4ea84d3144 ac8c4245b2
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Tue Oct 26 23:43:46 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    gdktypes: Remove GDK_EXTERN_VAR
    
    Closes #4373
    
    See merge request GNOME/gtk!4097

 gdk/gdk.h                                      |   1 +
 gdk/gdkdevice.h                                |   1 +
 gdk/gdkdevicetool.h                            |   3 +-
 gdk/gdkdrag.h                                  |   3 +-
 gdk/gdkdrop.h                                  |   1 +
 gdk/gdkenums.h                                 | 336 +++++++++++++++++++++++++
 gdk/gdkevents.h                                |   7 +-
 gdk/gdkkeysprivate.h                           |   2 +
 gdk/gdkmemoryformatprivate.h                   |   2 +-
 gdk/gdkmemorytexture.h                         |   1 +
 gdk/gdkpopuplayout.h                           |   3 +-
 gdk/gdktextureprivate.h                        |   2 +
 gdk/gdktypes.h                                 | 321 -----------------------
 gdk/gdkvulkancontextprivate.h                  |   1 +
 gdk/meson.build                                |   1 +
 gtk/gtkcssimageurl.c                           |  10 +
 testsuite/reftests/css-image-broken-url.css    |   4 +
 testsuite/reftests/css-image-broken-url.ref.ui |   8 +
 testsuite/reftests/css-image-broken-url.ui     |   9 +
 testsuite/reftests/meson.build                 |   3 +
 20 files changed, 391 insertions(+), 328 deletions(-)
---