diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-27 12:51:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-29 10:37:32 +0200 |
commit | 749e7d3a957a8b3f39afe6cc39097f1730cf9444 (patch) | |
tree | 6959b1920aa8b85af4aa3ce9c258b48867b23134 | |
parent | 845d13da5e6ad17bdf75797da11722db74ef0871 (diff) | |
download | meta-openembedded-749e7d3a957a8b3f39afe6cc39097f1730cf9444.tar.gz |
libnotify3, nautilus3: exclude from world
* libnotify3 conflicts with libnotify and breaks couple of gnome recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb | 3 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb index 4c46ec4fd..fb9752fc5 100644 --- a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb +++ b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb | |||
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | |||
5 | 5 | ||
6 | DEPENDS = "dbus gtk+3" | 6 | DEPENDS = "dbus gtk+3" |
7 | 7 | ||
8 | # conflicts with libnotify, mixing them in build breaks couple of packages | ||
9 | EXCLUDE_FROM_WORLD = "1" | ||
10 | |||
8 | BPN = "libnotify" | 11 | BPN = "libnotify" |
9 | 12 | ||
10 | inherit gnome lib_package | 13 | inherit gnome lib_package |
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb index a9dcaf46e..1acf8d3e9 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb | |||
@@ -11,6 +11,9 @@ PR = "r4" | |||
11 | DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3" | 11 | DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3" |
12 | # optional: tracker | 12 | # optional: tracker |
13 | 13 | ||
14 | # needs libnotify3 which conflicts with libnotify, mixing them in build breaks couple of packages | ||
15 | EXCLUDE_FROM_WORLD = "1" | ||
16 | |||
14 | # to include nautilus3/no-try-run-strftime.diff before the rest | 17 | # to include nautilus3/no-try-run-strftime.diff before the rest |
15 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" | 18 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" |
16 | BPN = "nautilus" | 19 | BPN = "nautilus" |