All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andreas Müller" <schnitzeltony@googlemail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 03/13] gnome-menus3: unblacklist and cleanup
Date: Mon, 31 Oct 2016 23:10:39 +0100	[thread overview]
Message-ID: <1477951849-32149-3-git-send-email-schnitzeltony@googlemail.com> (raw)
In-Reply-To: <1477951849-32149-1-git-send-email-schnitzeltony@googlemail.com>

* 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>
---
 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



  parent reply	other threads:[~2016-10-31 22:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-31 22:10 [PATCH 01/13] python-distutils-extra: initial add 2.39 Andreas Müller
2016-10-31 22:10 ` [PATCH 02/13] python3-psutil: add python3 version of psutil Andreas Müller
2016-10-31 22:10 ` Andreas Müller [this message]
2016-10-31 22:10 ` [PATCH 04/13] menulibre: initial add 2.1.3 Andreas Müller
2016-10-31 22:10 ` [PATCH 05/13] xfce4-whiskermenu-plugin: update to 2.0.2 Andreas Müller
2016-10-31 22:10 ` [PATCH 06/13] xfce4-whiskermenu-plugin: add menulibre to RRECOMMENDS Andreas Müller
2016-10-31 22:10 ` [PATCH 07/13] ristretto: update to 0.8.1 Andreas Müller
2016-10-31 22:10 ` [PATCH 08/13] xfconf: update to 4.12.1 Andreas Müller
2016-10-31 22:10 ` [PATCH 09/13] xfce4-notifyd: update to 0.3.3 Andreas Müller
2016-10-31 22:10 ` [PATCH 10/13] poppler: update to 0.48.0 Andreas Müller
2016-10-31 22:10 ` [PATCH 11/13] xfce4-terminal: update to 0.8.1 Andreas Müller
2016-10-31 22:10 ` [PATCH 12/13] xfce4-panel: do not display desktop icon when no window is opened Andreas Müller
2016-10-31 22:10 ` [PATCH 13/13] xfce4-panel: update to 4.12.1 Andreas Müller
2016-11-21 12:08 ` [PATCH 01/13] python-distutils-extra: initial add 2.39 Andreas Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477951849-32149-3-git-send-email-schnitzeltony@googlemail.com \
    --to=schnitzeltony@googlemail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.