[OE-core] [PATCH] qt4-x11-free: depend on ICU

[Paul Eggleton]

Hi Ross,

On Friday 29 November 2013 13:51:05 Ross Burton wrote:
> ICU presence is auto-detected at configure time and until recently (e68850
> and d61230) was pulled into most builds through harfbuzz and beecrypt.  Now
> it's floating and this leads to build failures.
> 
> As in all likelihood the majority of people were building this with ICU
> enabled, add an explicit dependency.
> 
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>  meta/recipes-qt/qt4/qt4.inc          |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc index 369b3d5..46869aa 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -3,7 +3,7 @@ require qt4.inc
>  DESCRIPTION = "Qt is a versatile cross-platform application framework --
> this is the X11 version." HOMEPAGE = "http://qt-project.org/"
>  SECTION = "x11/libs"
> -DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor" +DEPENDS += "virtual/libgl virtual/libx11
> fontconfig libxft libxext libxrender libxrandr libxcursor icu" PROVIDES +=
> "qt4-x11"
>  QT4DEPENDS = ""
> 
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 293eb87..659561c 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -23,7 +23,7 @@ QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES',
> 'pulseaudio', '-pulseaudio QT_CONFIG_FLAGS += "-release -no-cups
> -reduce-relocations \
>                      -shared -no-nas-sound -no-nis \
>                      -system-libjpeg -system-libpng -system-libtiff
> -system-zlib \ -                    -no-pch -stl -glib \
> +                    -no-pch -stl -glib -icu \
>                      -no-rpath -silent \
>                      ${QT_DBUS} \
>                      ${QT_QT3SUPPORT} \

It seems like ICU might still have problems building for PowerPC. If that's 
the case, we should probably be explicitly disabling ICU for that 
architecture, right?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre