From 40dbe9fd0d0ec8bd4d5faef5e4633de7b14f29a2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 12:51:13 +0200 Subject: [PATCH] libnotify3, nautilus3: exclude from world * libnotify3 conflicts with libnotify and breaks couple of gnome recipes (From meta-openembedded rev: 749e7d3a957a8b3f39afe6cc39097f1730cf9444) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb | 3 +++ meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb index 4c46ec4..fb9752f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb +++ b/meta-openembedded/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-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb index a9dcaf4..1acf8d3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb +++ b/meta-openembedded/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" -- 2.7.4