Re: [STABLE] [PATCH] icu: Add patch for dangling #elif expression

[Philip Balister <philip@balister.org>]

On 12/05/2009 02:00 PM, Cory Maccarrone wrote:
> This change adds a patch that fixes a compile error in
> source/layoutex/ParagraphLayout.cpp caused by an

I'm testing this and also see a problem with icu-native preventing icu 
from building. Did you fix this in stable also?

Philip

>
> Signed-off-by: Cory Maccarrone<darkstar6262@gmail.com>
> ---
>   recipes/icu/files/fix-elif-expression.patch |   11 +++++++++++
>   recipes/icu/icu-3.6.inc                     |    3 ++-
>   2 files changed, 13 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/icu/files/fix-elif-expression.patch
>
> diff --git a/recipes/icu/files/fix-elif-expression.patch b/recipes/icu/files/fix-elif-expression.patch
> new file mode 100644
> index 0000000..6021bee
> --- /dev/null
> +++ b/recipes/icu/files/fix-elif-expression.patch
> @@ -0,0 +1,11 @@
> +--- source/layoutex/ParagraphLayout.cpp	2006-08-22 17:12:42.000000000 -0700
> ++++ source/layoutex/ParagraphLayout.cpp-new	2009-12-05 10:35:04.728241416 -0800
> +@@ -798,7 +798,7 @@
> +
> +     return nullLanguageCode;
> + }
> +-#elif
> ++#else
> +
> + // TODO - dummy implementation for right now...
> + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
> diff --git a/recipes/icu/icu-3.6.inc b/recipes/icu/icu-3.6.inc
> index 04fc842..aaacd83 100644
> --- a/recipes/icu/icu-3.6.inc
> +++ b/recipes/icu/icu-3.6.inc
> @@ -1,7 +1,8 @@
>
>   LICENSE = "ICU"
>
> -SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz"
> +SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
> +           file://fix-elif-expression.patch;patch=1"
>
>   S = "${WORKDIR}/icu/source"
>