[PATCH 6/7] epiphany: update 43.1 -> 44.0


Markus Volk
 

Signed-off-by: Markus Volk <f_l_k@...>
---
.../{epiphany_43.1.bb =3D> epiphany_44.0.bb} | 37 +++++++++++--------
1 file changed, 22 insertions(+), 15 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_43.1.bb =3D> epiphany_44.0.=
bb} (72%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_43.1.bb b/meta/recipes-=
gnome/epiphany/epiphany_44.0.bb
similarity index 72%
rename from meta/recipes-gnome/epiphany/epiphany_43.1.bb
rename to meta/recipes-gnome/epiphany/epiphany_44.0.bb
index ea22723a97..f10b818a06 100644
--- a/meta/recipes-gnome/epiphany/epiphany_43.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_44.0.bb
@@ -7,20 +7,27 @@ LICENSE =3D "GPL-3.0-or-later"
LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Dd32239bcb673463ab874e80d47fae=
504"
=20
DEPENDS =3D " \
- webkitgtk \
- gcr3 \
- gsettings-desktop-schemas \
- nettle \
- json-glib \
- libarchive \
- libdazzle \
- libhandy \
- libportal \
- libsoup \
- glib-2.0-native \
- coreutils-native \
- desktop-file-utils-native \
- "
+ appstream-glib-native \
+ coreutils-native \
+ desktop-file-utils-native \
+ gcr \
+ glib-2.0-native \
+ gsettings-desktop-schemas \
+ gstreamer1.0 \
+ iso-codes \
+ json-glib \
+ libadwaita \
+ libarchive \
+ libdazzle \
+ libhandy \
+ libportal \
+ libsecret \
+ libsoup \
+ libxml2 \
+ nettle \
+ sqlite3 \
+ webkitgtk \
+"
=20
GNOMEBASEBUILDCLASS =3D "meson"
inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cac=
he
@@ -31,7 +38,7 @@ SRC_URI =3D "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.tri=
m_version("${PV}", 1)}/${GN
file://migrator.patch \
file://distributor.patch \
"
-SRC_URI[archive.sha256sum] =3D "e86ead27cb9982815150664de3bf20faf375f77b=
8065b02b31180c65b6bbebb4"
+SRC_URI[archive.sha256sum] =3D "aabdc9de80c409073676e00e15ba97187715e4b8=
4bc776fe86db86d0f8140bb1"
=20
# Developer mode enables debugging
PACKAGECONFIG[developer-mode] =3D "-Ddeveloper_mode=3Dtrue,-Ddeveloper_m=
ode=3Dfalse"
--=20
2.34.1


Alexandre Belloni
 

This fails on the AB:

https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2612/steps/13/logs/stdio

ERROR: Nothing PROVIDES 'libadwaita' (but /home/pokybuild/yocto-worker/reproducible/build/meta/recipes-gnome/epiphany/epiphany_44.0.bb DEPENDS on or otherwise requires it). Close matches:
libedit

On 25/03/2023 01:48:17+0100, Markus Volk wrote:
Signed-off-by: Markus Volk <f_l_k@...>
---
.../{epiphany_43.1.bb => epiphany_44.0.bb} | 37 +++++++++++--------
1 file changed, 22 insertions(+), 15 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_43.1.bb => epiphany_44.0.bb} (72%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_43.1.bb b/meta/recipes-gnome/epiphany/epiphany_44.0.bb
similarity index 72%
rename from meta/recipes-gnome/epiphany/epiphany_43.1.bb
rename to meta/recipes-gnome/epiphany/epiphany_44.0.bb
index ea22723a97..f10b818a06 100644
--- a/meta/recipes-gnome/epiphany/epiphany_43.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_44.0.bb
@@ -7,20 +7,27 @@ LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

DEPENDS = " \
- webkitgtk \
- gcr3 \
- gsettings-desktop-schemas \
- nettle \
- json-glib \
- libarchive \
- libdazzle \
- libhandy \
- libportal \
- libsoup \
- glib-2.0-native \
- coreutils-native \
- desktop-file-utils-native \
- "
+ appstream-glib-native \
+ coreutils-native \
+ desktop-file-utils-native \
+ gcr \
+ glib-2.0-native \
+ gsettings-desktop-schemas \
+ gstreamer1.0 \
+ iso-codes \
+ json-glib \
+ libadwaita \
+ libarchive \
+ libdazzle \
+ libhandy \
+ libportal \
+ libsecret \
+ libsoup \
+ libxml2 \
+ nettle \
+ sqlite3 \
+ webkitgtk \
+"

GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache
@@ -31,7 +38,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
file://migrator.patch \
file://distributor.patch \
"
-SRC_URI[archive.sha256sum] = "e86ead27cb9982815150664de3bf20faf375f77b8065b02b31180c65b6bbebb4"
+SRC_URI[archive.sha256sum] = "aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1"

# Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
--
2.34.1


--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


Markus Volk
 

libadwaita is a hard dependency for epiphany so it would be needed to import it from meta-gnome or to move  epiphany to meta-gnome

https://gitlab.gnome.org/GNOME/epiphany/-/blob/44.0/meson.build#L78


Am 27.03.23 um 16:38 schrieb Alexandre Belloni:

ERROR: Nothing PROVIDES 'libadwaita' (but /home/pokybuild/yocto-worker/reproducible/build/meta/recipes-gnome/epiphany/epiphany_44.0.bb DEPENDS on or otherwise requires it). Close matches:
libedit


Alexander Kanavin
 

We do want a real browser application in oe-core, and there's no
better choice than epiphany, even though it tends to pull in hard
dependencies that are sometimes questionable from 'lean build'
perspective.

If webkitgtk itself has an alternative in-tree, then epiphany can move
to meta-gnome.

Alex

On Tue, 28 Mar 2023 at 02:54, Markus Volk <f_l_k@...> wrote:

libadwaita is a hard dependency for epiphany so it would be needed to
import it from meta-gnome or to move epiphany to meta-gnome

https://gitlab.gnome.org/GNOME/epiphany/-/blob/44.0/meson.build#L78


Am 27.03.23 um 16:38 schrieb Alexandre Belloni:
ERROR: Nothing PROVIDES 'libadwaita' (but /home/pokybuild/yocto-worker/reproducible/build/meta/recipes-gnome/epiphany/epiphany_44.0.bb DEPENDS on or otherwise requires it). Close matches:
libedit


Khem Raj
 



On Tue, Mar 28, 2023 at 1:27 AM Alexander Kanavin <alex.kanavin@...> wrote:
We do want a real browser application in oe-core, and there's no
better choice than epiphany, even though it tends to pull in hard
dependencies that are sometimes questionable from 'lean build'
perspective.

There is mini-browser option in WebKit who I might be interesting though I have never used it myself there is also surf recipe in meta-gnome which could be a good replacement 


If webkitgtk itself has an alternative in-tree, then epiphany can move
to meta-gnome.

Alex

On Tue, 28 Mar 2023 at 02:54, Markus Volk <f_l_k@...> wrote:
>
> libadwaita is a hard dependency for epiphany so it would be needed to
> import it from meta-gnome or to move  epiphany to meta-gnome
>
> https://gitlab.gnome.org/GNOME/epiphany/-/blob/44.0/meson.build#L78
>
>
> Am 27.03.23 um 16:38 schrieb Alexandre Belloni:
> > ERROR: Nothing PROVIDES 'libadwaita' (but /home/pokybuild/yocto-worker/reproducible/build/meta/recipes-gnome/epiphany/epiphany_44.0.bb DEPENDS on or otherwise requires it). Close matches:
> >    libedit
>
>
>




Alexander Kanavin
 

On Tue, 28 Mar 2023 at 15:33, Khem Raj <raj.khem@...> wrote:
There is mini-browser option in WebKit who I might be interesting though I have never used it myself there is also surf recipe in meta-gnome which could be a good replacement
Both are significantly worse options.

Alex