GNOME Bugzilla – Bug 785964
meson: Fix building gtk-docs
Last modified: 2017-08-13 10:32:12 UTC
Patches follow.
Created attachment 357143 [details] [review] [PATCH 1/3] meson: Use configure_file() to copy typesfile The working directory is the builddir and gnome.gtkdoc is not smart enough to figure out whether the filename(s) passed are found in the builddir or srcdir. Using files() doesn't help, either, since it always generates paths to the builddir. Other projects (GStreamer, Grilo) seem to use configure_file to copy the typesfile to the builddir. Follow this. This fixes the following error: Cannot open gdk-pixbuf.types: No such file or directory
Created attachment 357144 [details] [review] [PATCH 2/3] meson: Use include_directories references throughout
Created attachment 357145 [details] [review] [PATCH 3/3] meson: Use the right dependency for gtkdoc The gdkpixbuf_dep pulls in the right include dir. This fixes the following error: gdk-pixbuf-scan.c:7:10: fatal error: gdk-pixbuf/gdk-pixbuf.h: No such file or directory
Review of attachment 357143 [details] [review]: This is really a bug in Meson's gnome module. I don't particularly object, but could you add a comment before pushing to master, saying that this should be removed once Meson is fixed?
Review of attachment 357144 [details] [review]: Thanks for the cleanup, looks good.
Review of attachment 357145 [details] [review]: Indeed, thanks for catching this.
Pushed to master. I tweaked attachment 357143 [details] [review] to include a comment in the meson.build file, so we don't inadvertedly leave that bit in.