summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-23 18:16:49 +0300
committerKhem Raj <raj.khem@gmail.com>2019-07-26 14:29:17 -0700
commitfc5030a5fb96e6e430620553107680e420beadec (patch)
tree3e746068a3024d4ef3cc7589fae2d9ae16044ce7
parentbd526f7cc3a757b9b6d85a2ee1658950c53a5578 (diff)
downloadmeta-openembedded-fc5030a5fb96e6e430620553107680e420beadec.tar.gz
meta-oe: Inherit gnomebase instead of gnome
The gnome class pulls in usually unwanted dependencies like gconf. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb2
-rw-r--r--meta-oe/recipes-gnome/vte9/vte9.inc2
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb3
-rw-r--r--meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb4
-rw-r--r--meta-oe/recipes-support/pidgin/gmime_3.2.3.bb2
5 files changed, 7 insertions, 6 deletions
diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb
index 63f4f09ba..e587e2a10 100644
--- a/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb
+++ b/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 7
8DEPENDS = "atk glibmm" 8DEPENDS = "atk glibmm"
9 9
10inherit distro_features_check gnome autotools pkgconfig 10inherit distro_features_check gnomebase autotools pkgconfig
11 11
12REQUIRED_DISTRO_FEATURES = "x11" 12REQUIRED_DISTRO_FEATURES = "x11"
13 13
diff --git a/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-oe/recipes-gnome/vte9/vte9.inc
index 206c430da..d860d44e2 100644
--- a/meta-oe/recipes-gnome/vte9/vte9.inc
+++ b/meta-oe/recipes-gnome/vte9/vte9.inc
@@ -8,7 +8,7 @@ RDEPENDS_libvte = "vte-termcap"
8GNOMEBN = "vte" 8GNOMEBN = "vte"
9S = "${WORKDIR}/vte-${PV}" 9S = "${WORKDIR}/vte-${PV}"
10 10
11inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection 11inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection
12ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 12ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
13 13
14EXTRA_OECONF = "--disable-python" 14EXTRA_OECONF = "--disable-python"
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
index 943986e77..1d64910fd 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
@@ -8,6 +8,7 @@ DEPENDS = " \
8 gdk-pixbuf-native \ 8 gdk-pixbuf-native \
9 intltool-native \ 9 intltool-native \
10 libxslt-native \ 10 libxslt-native \
11 dbus-glib \
11 gtk+ \ 12 gtk+ \
12 babl \ 13 babl \
13 gegl \ 14 gegl \
@@ -24,7 +25,7 @@ DEPENDS = " \
24" 25"
25DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" 26DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}"
26 27
27inherit distro_features_check gnome gtk-doc 28inherit distro_features_check gnomebase gtk-icon-cache gtk-doc
28 29
29REQUIRED_DISTRO_FEATURES = "x11" 30REQUIRED_DISTRO_FEATURES = "x11"
30 31
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb
index 6a8274405..421ea9d5c 100644
--- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb
+++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based vol
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
4 4
5DEPENDS = "intltool-native gtkmm3 libcanberra pulseaudio" 5DEPENDS = "intltool-native gtk+3-native gtkmm3 libcanberra pulseaudio"
6 6
7inherit gnome distro_features_check 7inherit gnomebase distro_features_check
8 8
9REQUIRED_DISTRO_FEATURES = "x11" 9REQUIRED_DISTRO_FEATURES = "x11"
10 10
diff --git a/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb b/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb
index 8c6f0b010..bce89bec8 100644
--- a/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb
+++ b/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
4SECTION = "libs" 4SECTION = "libs"
5DEPENDS = "glib-2.0 zlib" 5DEPENDS = "glib-2.0 zlib"
6 6
7inherit gnome autotools gobject-introspection 7inherit gnomebase autotools gobject-introspection
8 8
9SRC_URI += "file://iconv-detect.h \ 9SRC_URI += "file://iconv-detect.h \
10 file://nodolt.patch" 10 file://nodolt.patch"