Merge branch 'ebassi/for-master' into 'master'

docs: Fix the dependencies links

See merge request GNOME/gtk!3284

7 files changed, 17 insertions, 24 deletions

diff --git a/docs/reference/gdk/gdk4.toml.in b/docs/reference/gdk/gdk4.toml.in
index f720744f9f..2f52e69be8 100644
--- a/docs/reference/gdk/gdk4.toml.in
+++ b/docs/reference/gdk/gdk4.toml.in
@@ -29,12 +29,12 @@ search_index = true
   [dependencies."GdkWayland-4.0"]
   name = "GdkWayland"
   description = "GDK Wayland Backend"
-  docs_url = "https://developer.gnome.org/gtk4/stable" # fixme
+  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/"
 
   [dependencies."GdkX11-4.0"]
   name = "GdkX11"
   description = "GDK X11 Backend"
-  docs_url = "https://developer.gnome.org/gtk4/stable" # fixme
+  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/"
 
 [theme]
 name = "basic"
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 66b0d150fc..3dc7a0ff92 100644
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -22,6 +22,8 @@ if get_option('gtk_doc')
     ],
     depend_files: [ expand_content_md_files ],
     build_by_default: true,
+    install: true,
+    install_dir: docs_dir,
   )
 
   if x11_enabled
@@ -42,6 +44,8 @@ if get_option('gtk_doc')
       depends: [ gdk_gir[0] ],
       depend_files: [ ],
       build_by_default: true,
+      install: true,
+      install_dir: docs_dir,
     )
   endif
 
@@ -63,6 +67,8 @@ if get_option('gtk_doc')
       depends: [ gdk_gir[0] ],
       depend_files: [ ],
       build_by_default: true,
+      install: true,
+      install_dir: docs_dir,
     )
   endif
 endif
diff --git a/docs/reference/gsk/gsk4.toml.in b/docs/reference/gsk/gsk4.toml.in
index 44d11c9d9b..9f71f74302 100644
--- a/docs/reference/gsk/gsk4.toml.in
+++ b/docs/reference/gsk/gsk4.toml.in
@@ -29,7 +29,7 @@ search_index = true
   [dependencies."Gdk-4.0"]
   name = "GDK"
   description = "The GTK windowing system abstraction"
-  docs_url = "../../Gdk/4.0/"
+  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4/"
 
 [theme]
 name = "basic"
diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
index 1e34799280..f482f9fd6f 100644
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -18,5 +18,7 @@ if get_option('gtk_doc')
     depends: [ gdk_gir[0] ],
     depend_files: [ expand_content_md_files ],
     build_by_default: true,
+    install: true,
+    install_dir: docs_dir,
   )
 endif
diff --git a/docs/reference/gtk/gtk4.toml.in b/docs/reference/gtk/gtk4.toml.in
index 0f79fe4910..f5aadc5192 100644
--- a/docs/reference/gtk/gtk4.toml.in
+++ b/docs/reference/gtk/gtk4.toml.in
@@ -29,12 +29,12 @@ search_index = true
   [dependencies."Gdk-4.0"]
   name = "GDK"
   description = "The GTK windowing system abstraction"
-  docs_url = "../../Gdk/4.0/"
+  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4/"
 
   [dependencies."Gsk-4.0"]
   name = "GSK"
   description = "The GTK rendering abstraction"
-  docs_url = "../../Gsk/4.0/"
+  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gsk4/"
 
 [theme]
 name = "basic"
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 38db6dd353..c1791edd53 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -47,6 +47,8 @@ if get_option('gtk_doc')
     depends: [ gdk_gir[0], gsk_gir[0] ],
     depend_files: [ expand_content_md_files ],
     build_by_default: true,
+    install: true,
+    install_dir: docs_dir,
   )
 endif
 
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 24d0daadb1..66598f249a 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,27 +1,10 @@
-if get_option('gtk_doc')
-  glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
-  glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
-
-  cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix', default_value: '/usr')
-  cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
-
-  gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
-  gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
-
-  docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
-
-  version_conf = configuration_data()
-  version_conf.set('GTK_VERSION', meson.project_version())
-
-  src_dir_conf = configuration_data()
-  src_dir_conf.set('SRC_DIR', meson.source_root())
-endif
-
 toml_conf = configuration_data()
 toml_conf.set('version', meson.project_version())
 
 gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
 
+docs_dir = gtk_datadir / 'doc/gtk4/reference'
+
 subdir('gdk')
 subdir('gsk')
 subdir('gtk')