summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-10-07 03:07:00 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-10 12:47:35 +0200
commitc734b14e2b900fe5172cc80185f0cf8b7734d0e8 (patch)
treea0046b6df33673a8809231f88a85c98c382f7fc3 /meta-gnome/recipes-gnome
parentf2135b3372f7c8cfd23f9ccb8dd3672f9cfc3781 (diff)
downloadmeta-openembedded-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')
-rw-r--r--meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb3
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb4
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 87060f3dc..38ea5e51a 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"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" 5 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
6 6
7PNBLACKLIST[gnome-menus3] = "CONFLICT: 24 files are conflicting with gnome-menus"
8# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory
9
7DEPENDS = "python libxml2 gconf popt gtk+3" 10DEPENDS = "python libxml2 gconf popt gtk+3"
8 11
9inherit gnomebase pkgconfig python-dir pythonnative 12inherit 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 8802dba1b..f89f3da9c 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"
4BPN = "gnome-panel" 4BPN = "gnome-panel"
5PR = "r1" 5PR = "r1"
6 6
7PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather"
8
7# conflicts with gnome-panel, because they provide the same package 9# conflicts with gnome-panel, because they provide the same package
8# http://patches.openembedded.org/patch/43105/ 10# http://patches.openembedded.org/patch/43105/
9EXCLUDE_FROM_WORLD = "1" 11EXCLUDE_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 5d6467f9a..69cdd8f51 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"
4SECTION = "x11/gnome/libs" 4SECTION = "x11/gnome/libs"
5DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" 5DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3"
6 6
7PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather"
8# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd
9# sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml
10
7BPN = "libgweather" 11BPN = "libgweather"
8 12
9inherit gnome 13inherit gnome