AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'use-gtk-doc-for-gtk4' into 'master'

Browse Source 
Use gtk-doc from the gtk-doc-for-gtk4 branch

See merge request GNOME/gtk!1683
This commit is contained in:
Matthias Clasen 2020-04-13 23:21:57 +00:00
commit fdf812b7d7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/meson.build
View File

@ -3,8 +3,9 @@ if get_option('gtk_doc')
error('Building the GTK documentation requires Meson 0.52.0') error('Building the GTK documentation requires Meson 0.52.0')
endif endif
# Use gtk-doc as a sub-project if the version isn't new enough # Use gtk-doc as a sub-project from the gtk-doc-for-gtk4 branch
dependency('gtk-doc', version: '>=1.32', # for the time being
dependency('gtk-doc', version: '>=1.99',
fallback: ['gtk-doc', 'dummy_dep'], fallback: ['gtk-doc', 'dummy_dep'],
default_options: ['tests=false']) default_options: ['tests=false'])

2
subprojects/gtk-doc.wrap
View File

@ -1,4 +1,4 @@
[wrap-git] [wrap-git]
directory=gtk-doc directory=gtk-doc
url=https://gitlab.gnome.org/GNOME/gtk-doc.git url=https://gitlab.gnome.org/GNOME/gtk-doc.git
revision=master revision=gtk-doc-for-gtk4