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 775038 - Build: Add wayland to GSKs dependencies
Build: Add wayland to GSKs dependencies
Status: RESOLVED FIXED
Product: gtk+
Classification: Platform
Component: .General
3.89.x
Other All
: Normal normal
: ---
Assigned To: gtk-bugs
gtk-bugs
Depends on:
Blocks:
 
 
Reported: 2016-11-24 18:53 UTC by Dominique Leuenberger
Modified: 2016-11-24 19:44 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Build: Add wayland to GSKs dependencies (1.10 KB, patch)
2016-11-24 18:53 UTC, Dominique Leuenberger
committed Details | Review

Description Dominique Leuenberger 2016-11-24 18:53:34 UTC
Not exactly sure if it should be added to PRIVATE or not; I followed the lead of GDK_DEPS
Comment 1 Dominique Leuenberger 2016-11-24 18:53:38 UTC
Created attachment 340704 [details] [review]
Build: Add wayland to GSKs dependencies

gskrenderer.c includes gdk/wayland/gdkwayland.h and as a consequence
we need to be able to locate wayland's headers in case they are not
in standard location.
Comment 2 Emmanuele Bassi (:ebassi) 2016-11-24 19:11:49 UTC
Review of attachment 340704 [details] [review]:

I'm puzzled as to how this should work.

Both libgdk and libgsk are private, non-installed libraries, and the header in question comes from the source/build directory, not from pkg-config. I don't understand why adding Wayland to the private requirements is going to do any good.
Comment 3 Dominique Leuenberger 2016-11-24 19:17:54 UTC
(In reply to Emmanuele Bassi (:ebassi) from comment #2)
> Review of attachment 340704 [details] [review] [review]:
> 
> I'm puzzled as to how this should work.
> 
> Both libgdk and libgsk are private, non-installed libraries, and the header
> in question comes from the source/build directory, not from pkg-config. I
> don't understand why adding Wayland to the private requirements is going to
> do any good.

yes but the header from our source direcory includes wayland-client.h - and this needs to be found using pkg-config
Comment 4 Dominique Leuenberger 2016-11-24 19:27:24 UTC
For reference, the build fails as follows if wayland has the header in non-default locations:

>[   95s] make[3]: Entering directory '/home/abuild/rpmbuild/BUILD/gtk+-3.89.1/gsk'
>[   95s]   CC       libgsk_4_la-gskrenderer.lo
>[   95s]   CC       libgsk_4_la-gskrendernode.lo
>[   95s]   CC       libgsk_4_la-gskrendernodeiter.lo
>[   95s]   CC       libgsk_4_la-gsktexture.lo
>[   95s] In file included from ../gdk/wayland/gdkwayland.h:32:0,
>[   95s]                  from gskrenderer.c:57:
>[   95s] ../gdk/wayland/gdkwaylanddevice.h:27:28: fatal error: wayland-client.h: No such file or directory
>[   95s]  #include <wayland-client.h>
>[   95s]                             ^
>[   95s] compilation terminated.
Comment 5 Emmanuele Bassi (:ebassi) 2016-11-24 19:32:43 UTC
Ah, of course.

Yes, then adding it to GSK_DEPS_PRIVATE is fine.
Comment 6 Emmanuele Bassi (:ebassi) 2016-11-24 19:33:07 UTC
Review of attachment 340704 [details] [review]:

ACK-by: me.
Comment 7 Dominique Leuenberger 2016-11-24 19:41:39 UTC
Comment on attachment 340704 [details] [review]
Build: Add wayland to GSKs dependencies

pushed as commit cae8fc