[08/10] epiphany: update 42.4 -> 43.0

soup 2.x support has been removed upstream.
libportal is no longer optional.
epiphany now also needs some native executables from
gtk and desktop-file-utils.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../epiphany/{epiphany_42.4.bb => epiphany_43.0.bb}  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_42.4.bb => epiphany_43.0.bb} (78%)

By adding gtk-icon-cache to the inherit line gtk+3-native could be 
removed from DEPENDS.

Am Do, 29. Dez 2022 um 17:01:08 +0100 schrieb Alexander Kanavin 
<alex.kanavin@gmail.com>:
> soup 2.x support has been removed upstream.
> libportal is no longer optional.
> epiphany now also needs some native executables from
> gtk and desktop-file-utils.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de 
> <mailto:alex@linutronix.de>>
> ---
>  .../epiphany/{epiphany_42.4.bb => epiphany_43.0.bb}  | 12 
> +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>  rename meta/recipes-gnome/epiphany/{epiphany_42.4.bb => 
> epiphany_43.0.bb} (78%)
> 
> diff --git a/meta/recipes-gnome/epiphany/epiphany_42.4.bb 
> b/meta/recipes-gnome/epiphany/epiphany_43.0.bb
> similarity index 78%
> rename from meta/recipes-gnome/epiphany/epiphany_42.4.bb
> rename to meta/recipes-gnome/epiphany/epiphany_43.0.bb
> index 0cbe1c9c58..071be328f3 100644
> --- a/meta/recipes-gnome/epiphany/epiphany_42.4.bb
> +++ b/meta/recipes-gnome/epiphany/epiphany_43.0.bb
> @@ -15,8 +15,12 @@ DEPENDS = " \
>            libarchive \
>            libdazzle \
>            libhandy \
> +          libportal \
> +          libsoup \
>            glib-2.0-native \
>            coreutils-native \
> +          gtk+3-native \
> +          desktop-file-utils-native \
>            "
> 
>  GNOMEBASEBUILDCLASS = "meson"
> @@ -28,16 +32,10 @@ SRC_URI = 
> "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
>             file://migrator.patch <file://migrator.patch/> \
>             file://distributor.patch <file://distributor.patch/> \
>             "
> -SRC_URI[archive.sha256sum] = 
> "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860"
> -
> -PACKAGECONFIG_SOUP ?= "soup3"
> -PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
> +SRC_URI[archive.sha256sum] = 
> "b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227"
> 
>  # Developer mode enables debugging
>  PACKAGECONFIG[developer-mode] = 
> "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
> -PACKAGECONFIG[soup2] = 
> "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
> -PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
> -PACKAGECONFIG[libportal] = 
> "-Dlibportal=enabled,-Dlibportal=disabled,libportal"
> 
>  FILES:${PN} += "${datadir}/dbus-1 
> ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
>  RDEPENDS:${PN} = "iso-codes adwaita-icon-theme 
> gsettings-desktop-schemas"
> --
> 2.30.2

That will be adjusted as well, thanks.

Alex

On Thu, 29 Dec 2022 at 17:34, Markus Volk <f_l_k@t-online.de> wrote:
>
> By adding gtk-icon-cache to the inherit line gtk+3-native could be removed from DEPENDS.
>
> Am Do, 29. Dez 2022 um 17:01:08 +0100 schrieb Alexander Kanavin <alex.kanavin@gmail.com>:
>
> soup 2.x support has been removed upstream. libportal is no longer optional. epiphany now also needs some native executables from gtk and desktop-file-utils. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../epiphany/{epiphany_42.4.bb => epiphany_43.0.bb} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_42.4.bb => epiphany_43.0.bb} (78%) diff --git a/meta/recipes-gnome/epiphany/epiphany_42.4.bb b/meta/recipes-gnome/epiphany/epiphany_43.0.bb similarity index 78% rename from meta/recipes-gnome/epiphany/epiphany_42.4.bb rename to meta/recipes-gnome/epiphany/epiphany_43.0.bb index 0cbe1c9c58..071be328f3 100644 --- a/meta/recipes-gnome/epiphany/epiphany_42.4.bb +++ b/meta/recipes-gnome/epiphany/epiphany_43.0.bb @@ -15,8 +15,12 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ + libportal \ + libsoup \ glib-2.0-native \ coreutils-native \ + gtk+3-native \ + desktop-file-utils-native \ " GNOMEBASEBUILDCLASS = "meson" @@ -28,16 +32,10 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN file://migrator.patch \ file://distributor.patch \ " -SRC_URI[archive.sha256sum] = "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860" - -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" +SRC_URI[archive.sha256sum] = "b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227" # Developer mode enables debugging PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" -PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" -PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" -PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
> --
> 2.30.2
>
>
>