gitlab-ci: store GdkWin32-4.0.gir on msys build

To match the name in the source file

.gitlab-ci.yml

@@ -80,6 +80,8 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
       - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/gtk/GdkX11-4.0.gir"
+      - "${CI_PROJECT_DIR}/_build/gtk/GdkWayland-4.0.gir"
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -207,6 +209,7 @@ msys2-ucrt64:
     expose_as: 'Windows_DLL_MSYS2_64_bit_toolchain'
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
+      - "${CI_PROJECT_DIR}/_build/gtk/GdkWin32-4.0.gir"
 
 macos:
   rules:
@@ -263,6 +266,7 @@ macos:
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/gtk/GdkMacos-4.0.gir"
 
 vs2019-x64:
   # TODO: Uncomment this when ready to merge.

gdk/macos/gdkmacosmonitor.c

@@ -49,7 +49,7 @@ G_DEFINE_TYPE (GdkMacosMonitor, gdk_macos_monitor, GDK_TYPE_MONITOR)
 /**
  * gdk_macos_monitor_get_workarea:
  * @monitor: a `GdkMonitor`
- * @workarea: (out): a `GdkRectangle` to be filled with the monitor workarea
+ * @geometry: (out): a `GdkRectangle` to be filled with the monitor geometry
  *
  * Retrieves the size and position of the “work area” on a monitor
  * within the display coordinate space.

gdk/macos/gdkmacosmonitor.h

@@ -40,7 +40,7 @@ GDK_AVAILABLE_IN_ALL
 void  gdk_macos_monitor_get_geometry (GdkMonitor   *self,
                                       GdkRectangle *geometry);
 GDK_AVAILABLE_IN_ALL
-void  gdk_macos_monitor_get_workarea (GdkMonitor   *self,
+void  gdk_macos_monitor_get_workarea (GdkMonitor   *monitor,
                                       GdkRectangle *geometry);
 
 G_END_DECLS

gtk/meson.build

@@ -1215,6 +1215,24 @@ if build_gir
     gtk_dep_sources += gdk_win32_gir
   endif
 
+  if macos_enabled
+    gdk_macos_gir = gnome.generate_gir(libgtk,
+      sources: gdk_macos_public_headers + gdk_macos_sources,
+      namespace: 'GdkMacos',
+      nsversion: gtk_api_version,
+      identifier_prefix: 'Gdk',
+      symbol_prefix: 'gdk',
+      export_packages: 'gtk4-macos',
+      includes: [ gdk_gir[0], ],
+      install: true,
+      dependencies: libgdk_dep,
+      header: 'gdk/macos/gdkmacos.h',
+      extra_args: gir_args,
+      fatal_warnings: get_option('werror'),
+    )
+    gtk_dep_sources += gdk_macos_gir
+  endif
+
   gsk_gir_inc = [ gdk_gir[0], 'Graphene-1.0' ]
 
   gsk_gir = gnome.generate_gir(libgtk,