* old gnome-menus is broken so there is no conflict * we should prefer newer version * menulibre (part of this series) requires gnome-menus3 * gnome-menus3-python was empty
Signed-off-by: Andreas Müller <[email protected]> --- meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | 9 +-------- meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index bf55197..544bbc1 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -4,10 +4,7 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus" -# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory - -DEPENDS = "python libxml2 gconf popt gtk+3" +DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native" inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection @@ -19,8 +16,4 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71" -PACKAGES += "${PN}-python" FILES_${PN} += "${datadir}/desktop-directories/" -FILES_${PN}-python = "${libdir}/python*" -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ - ${PYTHON_SITEPACKAGES_DIR}/.debug" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index 4189518..2f55141 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -27,4 +27,4 @@ FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" # http://errors.yoctoproject.org/Errors/Details/81001/ -PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python" +PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python + conflicts with gnome-menu3" -- 2.5.5 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
