diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-07 03:07:00 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-10 12:47:35 +0200 |
| commit | c734b14e2b900fe5172cc80185f0cf8b7734d0e8 (patch) | |
| tree | a0046b6df33673a8809231f88a85c98c382f7fc3 /meta-gnome/recipes-gnome | |
| parent | f2135b3372f7c8cfd23f9ccb8dd3672f9cfc3781 (diff) | |
| download | meta-openembedded-contrib-c734b14e2b900fe5172cc80185f0cf8b7734d0e8.tar.gz | |
gnome-panel3, gnome-menus3, libgweather3: blacklist because of sysroot conflicts with 2* versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome')
3 files changed, 9 insertions, 0 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 87060f3dcc..38ea5e51a3 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,6 +4,9 @@ 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" inherit gnomebase pkgconfig python-dir pythonnative diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb index 8802dba1be..f89f3da9c9 100644 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb @@ -4,6 +4,8 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1" BPN = "gnome-panel" PR = "r1" +PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather" + # conflicts with gnome-panel, because they provide the same package # http://patches.openembedded.org/patch/43105/ EXCLUDE_FROM_WORLD = "1" diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb index 5d6467f9aa..69cdd8f512 100644 --- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb @@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome/libs" DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" +PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather" +# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd +# sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml + BPN = "libgweather" inherit gnome |