Merge branch 'win32-gir' into 'main'

Generate gtk/GdkWin32-4.0.gir

Closes #5112

See merge request GNOME/gtk!4965

gdk/win32/gdkwin32keys.h

@@ -61,12 +61,6 @@ typedef struct _GdkWin32KeymapClass GdkWin32KeymapClass;
 
 GType gdk_win32_keymap_get_type (void);
 
-GdkWin32KeymapMatch gdk_win32_keymap_check_compose (GdkWin32Keymap *keymap,
-                                                    guint16        *compose_buffer,
-                                                    gsize           compose_buffer_len,
-                                                    guint16        *output,
-                                                    gsize          *output_len);
-
 G_END_DECLS
 
 #endif /* __GDK_WIN32_KEYMAP_H__ */

gdk/win32/meson.build

@@ -1,6 +1,19 @@
-gdk_win32_sources = files([
-  'gdkcairocontext-win32.c',
+gdk_win32_public_sources = files([
   'gdkcursor-win32.c',
+  'gdkdisplay-win32.c',
+  'gdkdisplaymanager-win32.c',
+  'gdkdrag-win32.c',
+  'gdkglcontext-win32.c',
+  'gdkglcontext-win32-wgl.c',
+  'gdkwin32id.c',
+  'gdksurface-win32.c',
+  'gdkevents-win32.c',
+  'gdkmonitor-win32.c',
+  'gdkscreen-win32.c',
+])
+
+gdk_win32_sources = gdk_win32_public_sources + files([
+  'gdkcairocontext-win32.c',
   'gdkclipboard-win32.c',
   'gdkclipdrop-win32.c',
   'gdkdevicemanager-win32.c',
@@ -8,13 +21,7 @@ gdk_win32_sources = files([
   'gdkdevice-win32.c',
   'gdkdevice-winpointer.c',
   'gdkdevice-wintab.c',
-  'gdkdisplay-win32.c',
-  'gdkdisplaymanager-win32.c',
-  'gdkdrag-win32.c',
   'gdkdrop-win32.c',
-  'gdkevents-win32.c',
-  'gdkglcontext-win32.c',
-  'gdkglcontext-win32-wgl.c',
   'gdkglobals-win32.c',
   'gdkhdataoutputstream-win32.c',
   'gdkinput-dmanipulation.c',
@@ -24,14 +31,11 @@ gdk_win32_sources = files([
   'gdkkeys-win32-impl-wow64.c',
   'gdkwin32langnotification.c',
   'gdkmain-win32.c',
-  'gdkmonitor-win32.c',
   'gdkproperty-win32.c',
-  'gdkscreen-win32.c',
   'gdkvulkancontext-win32.c',
   'gdkwin32cursor.h',
   'gdkwin32display.h',
-  'gdkwin32id.c',
-  'gdksurface-win32.c',
+  'gdkwin32keys.h',
 ])
 
 gdk_win32_public_headers = files([
@@ -40,7 +44,6 @@ gdk_win32_public_headers = files([
   'gdkwin32displaymanager.h',
   'gdkwin32dnd.h',
   'gdkwin32glcontext.h',
-  'gdkwin32keys.h',
   'gdkwin32misc.h',
   'gdkwin32monitor.h',
   'gdkwin32screen.h',

gtk/meson.build

@@ -1309,6 +1309,24 @@ if build_gir
     gtk_dep_sources += gdk_wayland_gir
   endif
 
+  if win32_enabled
+    gdk_win32_gir = gnome.generate_gir(libgtk,
+      sources: gdk_win32_public_headers + gdk_win32_public_sources,
+      namespace: 'GdkWin32',
+      nsversion: gtk_api_version,
+      identifier_prefix: 'Gdk',
+      symbol_prefix: 'gdk',
+      export_packages: 'gtk4-win32',
+      includes: [ gdk_gir[0], 'win32-1.0', ],
+      install: true,
+      dependencies: libgdk_dep,
+      header: 'gdk/win32/gdkwin32.h',
+      extra_args: gir_args,
+      fatal_warnings: get_option('werror'),
+    )
+    gtk_dep_sources += gdk_win32_gir
+  endif
+
   gsk_gir_inc = [ gdk_gir[0], 'Graphene-1.0' ]
 
   gsk_gir = gnome.generate_gir(libgtk,