[oe-commits] Martin Jansa : libnotify3, nautilus3: exclude from world
git at git.openembedded.org
git at git.openembedded.org
Thu May 2 13:01:02 UTC 2013
Module: meta-openembedded.git
Branch: dylan-next
Commit: a8c0bcb6681dd6661ce8b48e141cf3f45d4b5cd7
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a8c0bcb6681dd6661ce8b48e141cf3f45d4b5cd7
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Sat Apr 27 12:51:13 2013 +0200
libnotify3, nautilus3: exclude from world
* libnotify3 conflicts with libnotify and breaks couple of gnome recipes
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../recipes-gnome/libnotify/libnotify3_0.7.3.bb | 3 +++
.../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 4c46ec4..fb9752f 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 a9dcaf4..1acf8d3 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"
More information about the Openembedded-commits
mailing list