After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 785964 - meson: Fix building gtk-docs
meson: Fix building gtk-docs
Status: RESOLVED FIXED
Product: gdk-pixbuf
Classification: Platform
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: gdk-pixbuf-maint
gdk-pixbuf-maint
Depends on:
Blocks:
 
 
Reported: 2017-08-07 20:12 UTC by Jan Alexander Steffens (heftig)
Modified: 2017-08-13 10:32 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
[PATCH 1/3] meson: Use configure_file() to copy typesfile (1.45 KB, patch)
2017-08-07 20:15 UTC, Jan Alexander Steffens (heftig)
committed Details | Review
[PATCH 2/3] meson: Use include_directories references throughout (4.64 KB, patch)
2017-08-07 20:16 UTC, Jan Alexander Steffens (heftig)
committed Details | Review
[PATCH 3/3] meson: Use the right dependency for gtkdoc (1.41 KB, patch)
2017-08-07 20:17 UTC, Jan Alexander Steffens (heftig)
committed Details | Review

Description Jan Alexander Steffens (heftig) 2017-08-07 20:12:56 UTC
Patches follow.
Comment 1 Jan Alexander Steffens (heftig) 2017-08-07 20:15:33 UTC
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
Comment 2 Jan Alexander Steffens (heftig) 2017-08-07 20:16:21 UTC
Created attachment 357144 [details] [review]
[PATCH 2/3] meson: Use include_directories references throughout
Comment 3 Jan Alexander Steffens (heftig) 2017-08-07 20:17:01 UTC
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
Comment 4 Emmanuele Bassi (:ebassi) 2017-08-13 10:14:58 UTC
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?
Comment 5 Emmanuele Bassi (:ebassi) 2017-08-13 10:15:39 UTC
Review of attachment 357144 [details] [review]:

Thanks for the cleanup, looks good.
Comment 6 Emmanuele Bassi (:ebassi) 2017-08-13 10:15:59 UTC
Review of attachment 357145 [details] [review]:

Indeed, thanks for catching this.
Comment 7 Emmanuele Bassi (:ebassi) 2017-08-13 10:32:03 UTC
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.