From 906c3c570adabac71d884be5570f34b9805cf836 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Apr 2020 16:40:11 -0400 Subject: [PATCH 1/2] Switch the gtk-doc subproject to the gtk-doc-for-gtk4 branch This branch contains assorted fixes and enhancements that are needed to build the gtk4 docs. --- subprojects/gtk-doc.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/gtk-doc.wrap b/subprojects/gtk-doc.wrap index 7469d027b0..0b8d4412d0 100644 --- a/subprojects/gtk-doc.wrap +++ b/subprojects/gtk-doc.wrap @@ -1,4 +1,4 @@ [wrap-git] directory=gtk-doc url=https://gitlab.gnome.org/GNOME/gtk-doc.git -revision=master +revision=gtk-doc-for-gtk4 From 1205f741060ed6720f785ffd8842417a509eaa9c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Apr 2020 16:40:57 -0400 Subject: [PATCH 2/2] Always use gtk-doc as a subproject for now We need the support for actions syntax, among other things. --- docs/reference/meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 842d3a68d9..1654463490 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -3,8 +3,9 @@ if get_option('gtk_doc') error('Building the GTK documentation requires Meson 0.52.0') endif - # Use gtk-doc as a sub-project if the version isn't new enough - dependency('gtk-doc', version: '>=1.32', + # Use gtk-doc as a sub-project from the gtk-doc-for-gtk4 branch + # for the time being + dependency('gtk-doc', version: '>=1.99', fallback: ['gtk-doc', 'dummy_dep'], default_options: ['tests=false'])