From 4edaf982499f6f9e1757f3aed8e3fdd44ab80e26 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sun, 17 Dec 2023 14:15:44 +0100 Subject: [PATCH] Use glib's gi-docgen documentation The commit chosen is just the current HEAD, there is no release with the port to gi-docgen. --- .gitlab-ci.yml | 2 +- make-release.sh | 2 +- subprojects/glib.wrap | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a4bcc6684..7edb9874b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -448,8 +448,8 @@ reference: --force-fallback-for=gdk-pixbuf,pango -Dintrospection=enabled -Ddocumentation=true - -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true + -Dglib:documentation=true -Dpango:gtk_doc=true -Dbuild-demos=false -Dbuild-examples=false diff --git a/make-release.sh b/make-release.sh index 3f941e8fbf..c7b2163587 100755 --- a/make-release.sh +++ b/make-release.sh @@ -13,7 +13,7 @@ fi meson subprojects update gi-docgen # make the release tarball -meson setup -Dintrospection=enabled -Dgtk_doc=true --force-fallback-for gi-docgen ${release_build_dir} || exit +meson setup -Dintrospection=enabled -Ddocumentation=true --force-fallback-for gi-docgen ${release_build_dir} || exit meson compile -C${release_build_dir} || exit meson dist -C${release_build_dir} --include-subprojects || exit diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index fb9c1ac9e0..f9c6b5607f 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -2,7 +2,7 @@ directory = glib url = https://gitlab.gnome.org/GNOME/glib.git push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/glib.git -revision = 2.76.0 +revision = e7eef648e187b117bb03937c30261a413fddd3e6 depth = 1 [provide]