[oe] [meta-gnome][PATCH v2] meta-gnome: Inherit gnomebase instead of gnome

[Khem Raj]

https://errors.yoctoproject.org/Errors/Details/253908/

On Tue, Jul 23, 2019 at 8:17 AM Adrian Bunk <bunk at stusta.de> wrote:
>
> The gnome class pulls in usually unwanted dependencies like gconf.
>
> Signed-off-by: Adrian Bunk <bunk at stusta.de>
> ---
>  meta-gnome/recipes-gnome/evince/evince_3.28.2.bb              | 2 +-
>  meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb                | 2 +-
>  .../recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb      | 2 +-
>  .../gnome-system-monitor/gnome-system-monitor_3.32.0.bb       | 2 +-
>  meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb                  | 4 ++--
>  meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb       | 2 +-
>  meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb             | 2 +-
>  7 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> index d2885906f..f45180e79 100644
> --- a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> +++ b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
>  SECTION = "x11/office"
>  DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native"
>
> -inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
> +inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
>
>  SRC_URI = " \
>      ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
> index ea6439d91..9046645f5 100644
> --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
> +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
> @@ -9,7 +9,7 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ \
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
> -inherit distro_features_check gnome gettext python3native
> +inherit distro_features_check gnomebase gconf gettext python3native
>
>  REQUIRED_DISTRO_FEATURES = "x11"
>
> diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
> index 1dad1e95b..85ee5e6cf 100644
> --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
> @@ -8,7 +8,7 @@ BPN = "gnome-desktop"
>
>  GNOMEBASEBUILDCLASS = "meson"
>
> -inherit gnome pkgconfig upstream-version-is-even gobject-introspection distro_features_check
> +inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check
>
>  # gobject-introspection is mandatory and cannot be configured
>  REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
> diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
> index c2432a322..701b0891c 100644
> --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
> @@ -14,7 +14,7 @@ DEPENDS = " \
>
>  GNOMEBASEBUILDCLASS = "meson"
>
> -inherit gnomebase gtk-icon-cache distro_features_check gettext
> +inherit gnomebase gconf gtk-icon-cache distro_features_check gettext
>
>  REQUIRED_DISTRO_FEATURES = "x11"
>
> diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
> index 3a4714a12..893379b52 100644
> --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
> +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
> @@ -3,9 +3,9 @@ LICENSE = "LGPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
>
>  GNOMEBASEBUILDCLASS = "meson"
> -inherit gnome bash-completion gettext upstream-version-is-even
> +inherit gnomebase bash-completion gettext upstream-version-is-even
>
> -DEPENDS += "libsecret glib-2.0 gconf libgudev shadow-native"
> +DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native"
>
>  SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
>
> diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb
> index 7babbd0a8..d9f643106 100644
> --- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb
> +++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb
> @@ -6,7 +6,7 @@ SECTION = "x11/gnome/libs"
>
>  DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native"
>
> -inherit distro_features_check gnome gobject-introspection gettext
> +inherit distro_features_check gnomebase gobject-introspection gettext
>
>  REQUIRED_DISTRO_FEATURES = "x11"
>
> diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb
> index 08e52241b..e2a838b3a 100644
> --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb
> +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb
> @@ -7,7 +7,7 @@ SECTION = "libs"
>
>  DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native"
>
> -inherit autotools pkgconfig gnome gconf gobject-introspection
> +inherit autotools pkgconfig gnomebase gconf gobject-introspection
>
>  SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel