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

Publish docs for Pango and GdkPixbuf

See merge request GNOME/gtk!3337

2 files changed, 15 insertions, 7 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d732984ce8..e70ea303b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -287,9 +287,9 @@ reference:
   stage: docs
   needs: []
   variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
+    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
     - meson compile -C _build
     - mkdir -p _reference/
     - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
@@ -297,6 +297,14 @@ reference:
     - mv _build/docs/reference/gdk/gdk4-wayland/ _reference/gdk4-wayland/
     - mv _build/docs/reference/gsk/gsk4/ _reference/gsk4/
     - mv _build/docs/reference/gtk/gtk4/ _reference/gtk4/
+    - mv _build/subprojects/pango/docs/Pango/ _reference/Pango/
+    - mv _build/subprojects/pango/docs/PangoCairo/ _reference/PangoCairo/
+    - mv _build/subprojects/pango/docs/PangoFc/ _reference/PangoFc/
+    - mv _build/subprojects/pango/docs/PangoFT2/ _reference/PangoFT2/
+    - mv _build/subprojects/pango/docs/PangoOT/ _reference/PangoOT/
+    - mv _build/subprojects/pango/docs/PangoXft/ _reference/PangoXft/
+    - mv _build/subprojects/gdk-pixbuf/docs/gdk-pixbuf/ _reference/gdk-pixbuf/
+    - mv _build/subprojects/gdk-pixbuf/docs/gdk-pixdata/ _reference/gdk-pixdata/
   artifacts:
     paths:
       - _reference
diff --git a/.gitlab-ci/pages/index.html b/.gitlab-ci/pages/index.html
index 440e18514d..4cffac6c3c 100644
--- a/.gitlab-ci/pages/index.html
+++ b/.gitlab-ci/pages/index.html
@@ -49,19 +49,19 @@ SPDX-License-Identifier: LGPL-2.1-or-later
           <p>GTK is the primary library used to construct user interfaces. It
           provides user interface controls and signal callbacks to respond to
           user actions.</p>
-          <p><a href="https://docs.gtk.org/gtk4/" class="external">GTK API reference</a></p>
+          <p><a href="https://docs.gtk.org/gtk4/">GTK API reference</a></p>
         </div>
 
         <div class="docblock">
           <h5 id="gdk">GSK</h5>
           <p>An intermediate layer which provides a rendering API implemented using Cairo, OpenGL or Vulkan.</p>
-          <p><a href="https://docs.gtk.org/gsk4/" class="external">GSK API reference</a></p>
+          <p><a href="https://docs.gtk.org/gsk4/">GSK API reference</a></p>
         </div>
 
         <div class="docblock">
           <h5 id="gdk">GDK</h5>
           <p>An intermediate layer which isolates GTK from the details of the windowing system.</p>
-          <p><a href="https://docs.gtk.org/gdk4/" class="external">GDK API reference</a></p>
+          <p><a href="https://docs.gtk.org/gdk4/">GDK API reference</a></p>
         </div>
 
         <div class="docblock">
@@ -69,13 +69,13 @@ SPDX-License-Identifier: LGPL-2.1-or-later
           <p>Pango is the core text and font handling library used in GTK
           applications. It has extensive support for the different writing
           systems used throughout the world.</p>
-          <p><a href="https://gnome.pages.gitlab.gnome.org/pango/Pango/" class="external">Pango API reference</a></p>
+          <p><a href="https://docs.gtk.org/Pango/">Pango API reference</a></p>
         </div>
 
         <div class="docblock">
           <h5 id="gdk-pixbuf">GdkPixbuf</h5>
           <p>GdkPixbuf is a library for image loading and manipulation.</p>
-          <p><a href="https://developer.gnome.org/gdk-pixbuf/" class="external">GdkPixbuf API reference</a></p>
+          <p><a href="https://docs.gtk.org/gdk-pixbuf/">GdkPixbuf API reference</a></p>
         </div>
 
         <div class="docblock">