mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
meta-gnome: 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>
This commit is contained in:
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
|
|||||||
SECTION = "x11/office"
|
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"
|
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 = " \
|
SRC_URI = " \
|
||||||
${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
|
${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ SECTION = "x11/gnome"
|
|||||||
LICENSE = "GPLv2+"
|
LICENSE = "GPLv2+"
|
||||||
PR = "r2"
|
PR = "r2"
|
||||||
|
|
||||||
DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ \
|
DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \
|
||||||
gtksourceview2 iso-codes intltool-native gnome-common-native \
|
gtksourceview2 iso-codes intltool-native gnome-common-native \
|
||||||
libice python3-six-native"
|
libice python3-six-native"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
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"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ BPN = "gnome-desktop"
|
|||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
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
|
# gobject-introspection is mandatory and cannot be configured
|
||||||
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
|
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ DEPENDS = " \
|
|||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
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"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ LICENSE = "LGPLv2"
|
|||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
|
||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
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"
|
SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ SECTION = "x11/gnome/libs"
|
|||||||
|
|
||||||
DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native"
|
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"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ SECTION = "libs"
|
|||||||
|
|
||||||
DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native"
|
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"
|
SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user