diff mbox series

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

Message ID 20230325004818.2784943-6-f_l_k@t-online.de
State New
Headers show
Series [1/7] glib-2.0: update 2.74.6 -> 2.76.1 | expand

Commit Message

Markus Volk March 25, 2023, 12:48 a.m. UTC
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../{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%)

Comments

Alexandre Belloni March 27, 2023, 2:38 p.m. UTC | #1
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@t-online.de>
> ---
>  .../{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
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#179086): https://lists.openembedded.org/g/openembedded-core/message/179086
> Mute This Topic: https://lists.openembedded.org/mt/97836713/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk March 28, 2023, 12:54 a.m. UTC | #2
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 March 28, 2023, 8:27 a.m. UTC | #3
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@t-online.de> 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
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#179192): https://lists.openembedded.org/g/openembedded-core/message/179192
> Mute This Topic: https://lists.openembedded.org/mt/97836713/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj March 28, 2023, 1:33 p.m. UTC | #4
On Tue, Mar 28, 2023 at 1:27 AM Alexander Kanavin <alex.kanavin@gmail.com>
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@t-online.de> 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
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#179210):
> https://lists.openembedded.org/g/openembedded-core/message/179210
> Mute This Topic: https://lists.openembedded.org/mt/97836713/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Alexander Kanavin March 28, 2023, 1:45 p.m. UTC | #5
On Tue, 28 Mar 2023 at 15:33, Khem Raj <raj.khem@gmail.com> 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
diff mbox series

Patch

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"