diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-10-31 23:10:39 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-22 13:59:37 +0100 |
| commit | 6914eb6354189dd3b625192e12b22e64f277e236 (patch) | |
| tree | 339674b0b07a4ba3e6543ff292b227208954c0f5 | |
| parent | 6864b601046c71509d924d7e2dfe811109984dc0 (diff) | |
| download | meta-openembedded-6914eb6354189dd3b625192e12b22e64f277e236.tar.gz | |
gnome-menus3: unblacklist and cleanup
* 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 <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | 9 | ||||
| -rw-r--r-- | 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 bf5519701..544bbc1a8 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" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
| 6 | 6 | ||
| 7 | PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus" | 7 | DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native" |
| 8 | # e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory | ||
| 9 | |||
| 10 | DEPENDS = "python libxml2 gconf popt gtk+3" | ||
| 11 | 8 | ||
| 12 | inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection | 9 | inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection |
| 13 | 10 | ||
| @@ -19,8 +16,4 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" | |||
| 19 | SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" | 16 | SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" |
| 20 | SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71" | 17 | SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71" |
| 21 | 18 | ||
| 22 | PACKAGES += "${PN}-python" | ||
| 23 | FILES_${PN} += "${datadir}/desktop-directories/" | 19 | FILES_${PN} += "${datadir}/desktop-directories/" |
| 24 | FILES_${PN}-python = "${libdir}/python*" | ||
| 25 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ | ||
| 26 | ${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 418951890..2f55141a8 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 \ | |||
| 27 | ${PYTHON_SITEPACKAGES_DIR}/.debug" | 27 | ${PYTHON_SITEPACKAGES_DIR}/.debug" |
| 28 | 28 | ||
| 29 | # http://errors.yoctoproject.org/Errors/Details/81001/ | 29 | # http://errors.yoctoproject.org/Errors/Details/81001/ |
| 30 | PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python" | 30 | PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python + conflicts with gnome-menu3" |