diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-27 12:51:13 +0200 |
|---|---|---|
| committer |   Eric Bénard <eric@eukrea.com> | 2013-04-30 21:23:14 +0200 |
| commit | a8c0bcb6681dd6661ce8b48e141cf3f45d4b5cd7 (patch) | |
| tree | 132dc7ce0e3f928d5011982f00379224b27534d2 | |
| parent | 0957300e7bf41a6a4693f14ae677bcf34def1473 (diff) | |
| download | meta-openembedded-contrib-a8c0bcb6681dd6661ce8b48e141cf3f45d4b5cd7.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 4c46ec4fda..fb9752fc5e 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" DEPENDS = "dbus gtk+3" +# conflicts with libnotify, mixing them in build breaks couple of packages +EXCLUDE_FROM_WORLD = "1" + BPN = "libnotify" 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 a9dcaf46ee..1acf8d3e9c 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" DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3" # optional: tracker +# needs libnotify3 which conflicts with libnotify, mixing them in build breaks couple of packages +EXCLUDE_FROM_WORLD = "1" + # to include nautilus3/no-try-run-strftime.diff before the rest FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" BPN = "nautilus" |