Merge branch 'build-fix' into 'master'

build: Collect gi-docgen's common arguments

See merge request GNOME/gtk!4108

docs/reference/gdk/meson.build

@@ -16,12 +16,10 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      '--quiet',
-      '--fatal-warnings',
+      gidocgen_common_args,
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
-      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],
@@ -46,12 +44,10 @@ if get_option('gtk_doc')
       command: [
         gidocgen,
         'generate',
-        '--quiet',
-        '--fatal-warnings',
+        gidocgen_common_args,
         '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
         '--config=@INPUT0@',
         '--output-dir=@OUTPUT@',
-        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT1@',
       ],
@@ -78,12 +74,10 @@ if get_option('gtk_doc')
       command: [
         gidocgen,
         'generate',
-        '--quiet',
-        '--fatal-warnings',
+        gidocgen_common_args,
         '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
         '--config=@INPUT0@',
         '--output-dir=@OUTPUT@',
-        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT1@',
       ],

docs/reference/gsk/meson.build

@@ -13,12 +13,10 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      '--quiet',
-      '--fatal-warnings',
+      gidocgen_common_args,
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
-      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],

docs/reference/gtk/meson.build

@@ -42,12 +42,10 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      '--quiet',
-      '--fatal-warnings',
+      gidocgen_common_args,
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
-      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],

docs/reference/meson.build

@@ -3,6 +3,15 @@ toml_conf.set('version', meson.project_version())
 
 gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
 
+gidocgen_common_args = [
+  '--quiet',
+  '--no-namespace-dir',
+]
+
+if get_option('werror')
+  gidocgen_common_args += ['--fatal-warnings']
+endif
+
 docs_dir = gtk_datadir / 'doc'
 
 if get_option('gtk_doc') and not build_gir

gdk/gdkclipboard.c

@@ -1253,14 +1253,14 @@ gdk_clipboard_set_content (GdkClipboard       *clipboard,
  * @...: value contents conforming to @type
  *
  * Sets the clipboard to contain the value collected from the given varargs.
- * 
+ *
  * Values should be passed the same way they are passed to other value
  * collecting APIs, such as [`method@GObject.Object.set`] or
- * [`id@g_signal_emit`].
+ * [`func@GObject.signal_emit`].
  *
  * ```c
  * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World");
- * 
+ *
  * gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, some_texture);
  * ```
  */

gtk/gtkicontheme.c

@@ -2748,7 +2748,7 @@ add_key_to_hash (gpointer key,
  *
  * Lists the names of icons in the current icon theme.
  *
- * Returns: (element-type utf8) (transfer full): a string array
+ * Returns: (array zero-terminated=1) (element-type utf8) (transfer full): a string array
  *   holding the names of all the icons in the theme. You must
  *   free the array using g_strfreev().
  */