Igalia / meta-webkit

Yocto / OpenEmbedded layer for WebKit based engines and browsers
MIT License
125 stars 67 forks source link

wpewebkit: Add unifdef-native dependency for versions >2.38 #423

Closed psaavedra closed 1 year ago

psaavedra commented 1 year ago

Fixes: #416

clopez commented 1 year ago

I think we should add this dependency to the main wpewebkit.inc even when it is not needed for older wpewebkit releases. unifdef is just a small program that is only needed at runtime when building, so its harmless to build it even when not needed.

This will be neded when we start building the 2.40 tarballs in any case as well.

The commit adding this dependency was 253528@main which is after 2.38 was forked at 253173@main that is why is still not needed for 2.38, but it will be for 2.40

Proposed patch:

diff --git a/recipes-browser/wpewebkit/wpewebkit.inc b/recipes-browser/wpewebkit/wpewebkit.inc
index 4de3667..48f9e50 100644
--- a/recipes-browser/wpewebkit/wpewebkit.inc
+++ b/recipes-browser/wpewebkit/wpewebkit.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf

 DEPENDS = " \
     ${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell gatesgarth hardknott honister', 'libsoup-2.4', 'libsoup', d)} \
-    bison-native gperf-native harfbuzz-native libxml2-native ccache-native ninja-native ruby-native cairo \
+    bison-native gperf-native harfbuzz-native libxml2-native ccache-native ninja-native ruby-native unifdef-native cairo \
     fontconfig freetype glib-2.0 harfbuzz icu jpeg pcre sqlite3 zlib libpng \
     libwebp libxml2 libxslt virtual/egl virtual/libgles2 libepoxy libgcrypt \
 "

We should also do the same for webkitgtk

psaavedra commented 1 year ago

I think we should add this dependency to the main wpewebkit.inc even when it is not needed for older wpewebkit releases. unifdef is just a small program that is only needed at runtime when building, so its harmless to build it even when not needed.

This will be neded when we start building the 2.40 tarballs in any case as well.

The commit adding this dependency was 253528@main which is after 2.38 was forked at 253173@main that is why is still not needed for 2.38, but it will be for 2.40

Proposed patch:

diff --git a/recipes-browser/wpewebkit/wpewebkit.inc b/recipes-browser/wpewebkit/wpewebkit.inc
index 4de3667..48f9e50 100644
--- a/recipes-browser/wpewebkit/wpewebkit.inc
+++ b/recipes-browser/wpewebkit/wpewebkit.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf

 DEPENDS = " \
     ${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell gatesgarth hardknott honister', 'libsoup-2.4', 'libsoup', d)} \
-    bison-native gperf-native harfbuzz-native libxml2-native ccache-native ninja-native ruby-native cairo \
+    bison-native gperf-native harfbuzz-native libxml2-native ccache-native ninja-native ruby-native unifdef-native cairo \
     fontconfig freetype glib-2.0 harfbuzz icu jpeg pcre sqlite3 zlib libpng \
     libwebp libxml2 libxslt virtual/egl virtual/libgles2 libepoxy libgcrypt \
 "

We should also do the same for webkitgtk

For the particular case, I can agree but generally speaking we are adding an artificial dependency for releases where it is not needed when there is a way to just added it in case of you are using devupstream packages. Kind of things like :append:class-devupstream are easily incorporated later to the next stable version of the recipe when this is released.