docs: Update the URL for related documentation

And install the gi-docgen project files for GDK.

diff --git a/docs/reference/gdk/gdk4-wayland.toml.in b/docs/reference/gdk/gdk4-wayland.toml.in
index 96ca18f64e9bfcb9194834d71767df5b22b5ae19..e83984a0b78ccd468944fdd214a163c6b276d5f5 100644 (file)
--- a/docs/reference/gdk/gdk4-wayland.toml.in
+++ b/docs/reference/gdk/gdk4-wayland.toml.in
@@ -13,7 +13,7 @@ devhelp = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
+  docs_url = "https://docs.gtk.org/gobject/"
 
 [theme]
 name = "basic"

diff --git a/docs/reference/gdk/gdk4-x11.toml.in b/docs/reference/gdk/gdk4-x11.toml.in
index 96ca18f64e9bfcb9194834d71767df5b22b5ae19..e83984a0b78ccd468944fdd214a163c6b276d5f5 100644 (file)
--- a/docs/reference/gdk/gdk4-x11.toml.in
+++ b/docs/reference/gdk/gdk4-x11.toml.in
@@ -13,7 +13,7 @@ devhelp = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
+  docs_url = "https://docs.gtk.org/gobject/"
 
 [theme]
 name = "basic"

diff --git a/docs/reference/gdk/gdk4.toml.in b/docs/reference/gdk/gdk4.toml.in
index 7454034d8be76ccc5c8c1d2f830e53ede4ccc873..fe938c4c05767b2a58624722484da4fc1692072a 100644 (file)
--- a/docs/reference/gdk/gdk4.toml.in
+++ b/docs/reference/gdk/gdk4.toml.in
@@ -14,7 +14,7 @@ search_index = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
+  docs_url = "https://docs.gtk.org/gobject/"
 
   [dependencies."cairo-1.0"]
   name = "Cairo"

diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index d5429928e1f4e29ce38b9adaf15593c97f4d2dbe..57da47f5f1c876a056111550351cdbdb4d1cd63d 100644 (file)
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -1,11 +1,15 @@
 expand_content_md_files = [
 ]
 
-gdk4_toml = configure_file(input: 'gdk4.toml.in', output: 'gdk4.toml', configuration: toml_conf)
-gdk4x11_toml = configure_file(input: 'gdk4-x11.toml.in', output: 'gdk4-x11.toml', configuration: toml_conf)
-gdk4wayland_toml = configure_file(input: 'gdk4-wayland.toml.in', output: 'gdk4-wayland.toml', configuration: toml_conf)
-
 if get_option('gtk_doc')
+  gdk4_toml = configure_file(
+    input: 'gdk4.toml.in',
+    output: 'gdk4.toml',
+    configuration: toml_conf,
+    install: true,
+    install_dir: docs_dir / 'gdk4',
+  )
+
   custom_target('gdk4-doc',
     input: [ gdk4_toml, gdk_gir[0] ],
     output: 'gdk4',
@@ -28,6 +32,14 @@ if get_option('gtk_doc')
   )
 
   if x11_enabled
+    gdk4x11_toml = configure_file(
+      input: 'gdk4-x11.toml.in',
+      output: 'gdk4-x11.toml',
+      configuration: toml_conf,
+      install: true,
+      install_dir: docs_dir / 'gdk4-x11',
+    )
+
     custom_target('gdk4-x11-doc',
       input: [ gdk4x11_toml, gdk_x11_gir[0] ],
       output: 'gdk4-x11',
@@ -52,6 +64,14 @@ if get_option('gtk_doc')
   endif
 
   if wayland_enabled
+    gdk4wayland_toml = configure_file(
+      input: 'gdk4-wayland.toml.in',
+      output: 'gdk4-wayland.toml',
+      configuration: toml_conf,
+      install: true,
+      install_dir: docs_dir / 'gdk4-wayland',
+    )
+
     custom_target('gdk4-wayland-doc',
       input: [ gdk4wayland_toml, gdk_wayland_gir[0] ],
       output: 'gdk4-wayland',

diff --git a/docs/reference/gdk/urlmap.js b/docs/reference/gdk/urlmap.js
index eaf2de9886ce7c2b07624c98fefe7f4ea7756d8f..355f47e35331e95e56aa59ef555f085ba68aeddf 100644 (file)
--- a/docs/reference/gdk/urlmap.js
+++ b/docs/reference/gdk/urlmap.js
@@ -3,11 +3,14 @@
 
 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
-    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
-    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
-    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
-    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
-    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
+    [ 'GLib', 'https://docs.gtk.org/glib/' ],
+    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
+    [ 'Gio', 'https://docs.gtk.org/gio/' ],
+    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
+    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
+    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
+    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
+    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
+    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
 ]