Hi Jan, Thanks a lot for the patch, it seems that there are actually two issues here: one with xkbcommon and one with wayland-client. I'll split these up and do a point release soon.
On Wed, May 17, 2023 at 11:15:34PM +0200, Jan Engelhardt wrote:
>
> On Wednesday 2023-05-17 23:01, Jan Engelhardt wrote:
> >On Wednesday 2023-05-17 21:14, Marius Vlad wrote:
> >>This is the official release for weston 12.0.0.
> >
> >Fails to build, it misses properly adding the output from xkbcommon.pc to the
> >compiler command line:[...]
>
> Patch follows.
>
> ----
>
> [ 5s] FAILED: libweston/libgl-borders.a.p/gl-borders.c.o
> [ 5s] cc -Ilibweston/libgl-borders.a.p -Ilibweston -I../libweston -I. -I..
> -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1
> -I/usr/include/cairo -I/usr/include/libpng16 -I/usr/include/freetype2
> -I/usr/include/webp -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall
> -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes
> -Wno-unused-parameter -Wno-shift-negative-value
> -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2
> -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong
> -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection
> -Werror=return-type -flto=auto -g -fPIC -MD -MQ
> libweston/libgl-borders.a.p/gl-borders.c.o -MF
> libweston/libgl-borders.a.p/gl-borders.c.o.d -o
> libweston/libgl-borders.a.p/gl-borders.c.o -c ../libweston/gl-borders.c
> [ 5s] In file included from ../libweston/renderer-gl/gl-renderer.h:32,
> [ 5s] from ../libweston/gl-borders.h:28,
> [ 5s] from ../libweston/gl-borders.c:31:
> [ 5s] ../include/libweston/libweston.h:39:10: fatal error:
> xkbcommon/xkbcommon.h: No such file or directory
>
> [ 4s] FAILED: shared/libshared.a.p/config-parser.c.o
> [ 4s] cc -Ishared/libshared.a.p -Ishared -I../shared -I. -I.. -Iinclude
> -I../include -I/usr/include/wayland -I/usr/include/pixman-1
> -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra
> -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter
> -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic
> -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
> -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
> -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ
> shared/libshared.a.p/config-parser.c.o -MF
> shared/libshared.a.p/config-parser.c.o.d -o
> shared/libshared.a.p/config-parser.c.o -c ../shared/config-parser.c
> [ 4s] In file included from ../shared/config-parser.c:44:
> [ 4s] ../include/libweston/libweston.h:39:10: fatal error:
> xkbcommon/xkbcommon.h: No such file or directory
>
> [ 6s] FAILED: tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o
> [ 6s] cc -Itests/libtest-xwayland-client.a.p -Itests -I../tests -I. -I..
> -Iinclude -I../include -Iprotocol -I/usr/include/pixman-1
> -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra
> -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter
> -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic
> -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
> -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
> -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ
> tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o -MF
> tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o.d -o
> tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o -c
> ../tests/xcb-client-helper.c
> [ 6s] ../tests/xcb-client-helper.c:39:10: fatal error: wayland-client.h:
> No such file or directory
>
> ---
> libweston/meson.build | 1 +
> shared/meson.build | 2 +-
> tests/meson.build | 2 +-
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> Index: weston/libweston/meson.build
> ===================================================================
> --- weston.orig/libweston/meson.build
> +++ weston/libweston/meson.build
> @@ -255,6 +255,7 @@ lib_gl_borders = static_library(
> dependencies: [
> dep_lib_cairo_shared,
> dep_egl, # for gl-renderer.h
> + dep_xkbcommon,
> ],
> build_by_default: false,
> install: false
> Index: weston/shared/meson.build
> ===================================================================
> --- weston.orig/shared/meson.build
> +++ weston/shared/meson.build
> @@ -7,7 +7,7 @@ srcs_libshared = [
> 'process-util.c',
> 'hash.c',
> ]
> -deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman]
> +deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman,
> dep_xkbcommon]
>
> lib_libshared = static_library(
> 'shared',
> Index: weston/tests/meson.build
> ===================================================================
> --- weston.orig/tests/meson.build
> +++ weston/tests/meson.build
> @@ -322,7 +322,7 @@ if get_option('xwayland')
> [ 'xcb-client-helper.c', weston_test_client_protocol_h ],
> include_directories: common_inc,
> dependencies: [
> - dep_pixman, dep_xcb_xwayland,
> + dep_pixman, dep_wayland_client, dep_xcb_xwayland,
> xcb_dep, xcb_cursor_dep
> ],
> install: false,
signature.asc
Description: PGP signature
