[oe] [PATCH] pimlico: remove Poky overrides

Khem Raj raj.khem at gmail.com
Wed Aug 29 14:17:21 UTC 2012


A bit explanation as to why it's done will be nice. 
Why comment out instead delete  
Is this window menu patch needed somewhere else
If not it must go as well 

On Aug 29, 2012, at 6:32 AM, Ross Burton <ross.burton at intel.com> wrote:

> ---
> meta-gnome/recipes-gnome/pimlico/contacts.inc |    4 +---
> meta-gnome/recipes-gnome/pimlico/dates.inc    |    4 +---
> meta-gnome/recipes-gnome/pimlico/tasks.inc    |    2 --
> 3 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc
> index 9798985..04de63c 100644
> --- a/meta-gnome/recipes-gnome/pimlico/contacts.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc
> @@ -5,13 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
> LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
> SECTION = "x11"
> DEPENDS = "glib-2.0 gtk+ evolution-data-server"
> -DEPENDS_append_poky = " libowl"
> RDEPENDS_${PN} = "libedata-book"
> 
> inherit autotools pkgconfig
> 
> OWL = "--disable-owl"
> -OWL_poky = "--enable-owl"
> 
> EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
> EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
> @@ -31,4 +29,4 @@ SRC_URI = "file://stock_contact.png \
>            file://contacts-conditionally-install-schema.patch \
>           "
> 
> -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
> +#SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
> diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc
> index 9b338fd..3c4a048 100644
> --- a/meta-gnome/recipes-gnome/pimlico/dates.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/dates.inc
> @@ -12,9 +12,7 @@ inherit autotools gettext pkgconfig gtk-icon-cache
> 
> # Poky/Sato specific enhancements
> OWL = "--disable-owl"
> -OWL_poky = "--enable-owl --disable-dnd"
> 
> EXTRA_OECONF += "${OWL}"
> -DEPENDS_append_poky = " libowl"
> -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
> +#SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
> 
> diff --git a/meta-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc
> index 9cd5259..a952153 100644
> --- a/meta-gnome/recipes-gnome/pimlico/tasks.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/tasks.inc
> @@ -6,11 +6,9 @@ LICENSE = "GPLv2 & GPLv2+"
> 
> SECTION = "x11"
> DEPENDS = "glib-2.0 gtk+ evolution-data-server"
> -DEPENDS_append_poky = " libowl"
> 
> inherit autotools pkgconfig gtk-icon-cache
> 
> OWL ?= "--disable-owl"
> -OWL_poky ?= "--enable-owl"
> 
> EXTRA_OECONF += "${OWL}"
> -- 
> 1.7.10
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel




More information about the Openembedded-devel mailing list