[OE-core] [PATCH 05/10] gtk: add demos to the configuation of gtk+

[Richard Purdie]

On Thu, 2011-12-08 at 17:34 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan at windriver.com>
> 
> Add demos for checking whether gtk+ run over directfb successfully or not.
> 
> [YOCTO #1674]
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan at windriver.com>
> ---
>  meta/recipes-gnome/gtk+/gtk+_2.24.8.bb |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)

Why can't we build the demos unconditionally? I'd like to think we could
just build these everywhere and drop the patch. Does that cause some
kind of problem on X?

Cheers,

Richard

> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> index fb88979..9119d16 100644
> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> @@ -9,12 +9,14 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
>             file://run-iconcache.patch \
>             file://configure-nm.patch \
>             file://hardcoded_libtool.patch \
> -           file://no-demos.patch \
> +           ${@base_contains('DISTRO_FEATURES', 'directfb', '','${NODEMOS_SRC_URI}', d)} \
>             file://cellrenderer-cairo.patch;striplevel=0 \
>             file://toggle-font.diff;striplevel=0 \
>             file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
>             file://doc-fixes.patch \
>  	  "
> +NODEMOS_SRC_URI = "file://no-demos.patch"
> +
>  # TO MERGE
>  #           file://entry-cairo.patch;striplevel=0
>  #           file://filesystem-volumes.patch
> @@ -27,7 +29,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
>  #        file://combo-arrow-size.patch;striplevel=0
>  #            file://configurefix.patch
>  
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
>  SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"