webkitdevci: Add xcb-util-cursor (for building cog/x11) and be explic…

…it about GTK4 * gtk4 is pulled in since sysprof, is a good idea to have it on the image in any case, so be explicit about it. * Adding xcb-util-cursor allows also to build cog with x11 platform plugin, which can be run with weston/xwayland. Signed-off-by: Carlos Alberto Lopez Perez <[email protected]>
Igalia · Jul 30, 2024 · ec00a77 · ec00a77
1 parent d5d6eb7
commit ec00a77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/recipes-browser/images/webkit-dev-ci-tools.bb b/recipes-browser/images/webkit-dev-ci-tools.bb
@@ -126,6 +126,7 @@ TOOLCHAIN_TARGET_TASK:remove = "target-sdk-provides-dummy"
 
 IMAGE_INSTALL:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland weston-xwayland', '', d)}"
 IMAGE_INSTALL:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init weston-examples waylandeglinfo', '', d)}"
+IMAGE_INSTALL:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk4','',d)}"
 IMAGE_INSTALL:append = " ${PREFERRED_PROVIDER_virtual/wpebackend}"
 IMAGE_INSTALL:append = " packagegroup-wpewebkit-depends"
 

diff --git a/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb b/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb
@@ -160,21 +160,22 @@ RDEPENDS:packagegroup-wpewebkit-depends-core:append:libc-glibc = "\
     localedef \
 "
 RDEPENDS:packagegroup-wpewebkit-depends-desktop = "\
-    libxt \
-    libxxf86vm \
+    alsa-lib \
+    atk \
+    at-spi2-atk \
+    gdk-pixbuf \
     libdrm \
+    liberation-fonts \
     libglu \
     libportal \
+    libx11-locale \
     libxi \
     libxkbcommon \
+    libxt \
     libxtst \
-    libx11-locale \
+    libxxf86vm \
+    xcb-util-cursor \
     xorg-minimal-fonts \
-    gdk-pixbuf \
-    liberation-fonts \
-    atk \
-    at-spi2-atk \
-    alsa-lib \
 "
 
 RDEPENDS:packagegroup-wpewebkit-depends-runtime-add = "\