From abc92f2d775c47cd1aa8eb96484511a446542688 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 10 Dec 2024 18:15:27 +0100
Subject: [PATCH] wpewebkit: clean up unwanted PACKAGECONFIGs

The main culprit is "accessibility", which adds a dependency with at-spi2-atk.
This service fails to launch if glib-2.0's gschemas.compiled file is missing,
which is the case in our default images. In turn, this failure causes webkit
to stall for 30 seconds before launching. Remove this PACKAGECONFIG to avoid
this issue.

While at it, remove other PACKAGECONFIGs:

    * "lbse" and "service-worker" are not configurable anymore and are now
      hardcoded features. Removing these PACKAGECONFIGs has no effect on the
      build, but their inclusion gives the false impression that they're
      configurable, so remove them. "webcrypto" is also not configurable
      anymore, but its PACKAGECONFIG pulls in necessary dependencies, so leave
      it enabled for now.
    * "openjpeg" is not only not configurable, but it's no longer supported.
      This PACKAGECONFIG pulls in an openjpeg dependency, making bitbake build
      the package even though it never gets included in the final image. Remove
      the config to prevent bitbake from building the openjpeg package at all.
    * "speech-synthesis" pulls in a dependency with flite, a 15 MiB speech
      synthesis tool. We aren't using this feature in our demos, so remove it
      from our default configuration to save some space.

https://onedigi.atlassian.net/browse/DEL-9404

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-browser/wpewebkit/wpewebkit_%.bbappend     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend
index 9edd79fc1..efbc82ef4 100644
--- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend
+++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend
@@ -9,6 +9,16 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 # Limit number of parallel threads make can run to avoid a ninja build issue
 PARALLEL_MAKE = "-j ${@oe.utils.cpu_count(at_most=16)}"
 
+# Remove PACKAGECONFIGs that either no longer work or pull in unwanted
+# dependencies
+PACKAGECONFIG:remove = " \
+    accessibility \
+    lbse \
+    openjpeg \
+    service-worker \
+    speech-synthesis \
+"
+
 # gbm PACKAGECONFIG pulls in libgbm dependency, which isn't available
 # on the i.MX6 and ccmp1
 PACKAGECONFIG:remove:ccimx6 = "gbm"