Skip to contentSkip to conversation

meta-gnome: Inherit gnomebase instead of gnome

PATCH Superseded Adrian Bunk 2 participants 3 messages Jul 23, 2019 – Jul 24, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 meta-gnome: Inherit gnomebase instead of gnome

The gnome class pulls in usually unwanted dependencies like gconf.

---
 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(-)
meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +1 -1
index d2885906f..f45180e79 100644
@@ -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 \
meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +1 -1
index ea6439d91..9046645f5 100644
@@ -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"
 
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +1 -1
index 1dad1e95b..85ee5e6cf 100644
@@ -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"
meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +1 -1
index c2432a322..701b0891c 100644
@@ -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"
 
meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +2 -2
index 3a4714a12..893379b52 100644
@@ -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"
 
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +1 -1
index 7babbd0a8..d9f643106 100644
@@ -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"
 
meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb +1 -1
index 08e52241b..e2a838b3a 100644
@@ -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"
 
Signature · 1 line
2.17.1
#1 lore raw

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

Quoted 116 lines · Adrian Bunk

The gnome class pulls in usually unwanted dependencies like gconf.

---
 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(-)
meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +1 -1
index d2885906f..f45180e79 100644
@@ -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 \
meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +1 -1
index ea6439d91..9046645f5 100644
@@ -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"
 
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +1 -1
index 1dad1e95b..85ee5e6cf 100644
@@ -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"
meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +1 -1
index c2432a322..701b0891c 100644
@@ -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"
 
meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +2 -2
index 3a4714a12..893379b52 100644
@@ -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"
 
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +1 -1
index 7babbd0a8..d9f643106 100644
@@ -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"
 
meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb +1 -2
index 08e52241b..e2a838b3a 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 1 line · Khem Raj

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

Sorry for that, I am puzzled how I missed that one. Fixed in v3.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed