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

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

[Cory Maccarrone]

This change adds a patch that fixes a compile error in
source/layoutex/ParagraphLayout.cpp caused by an

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"
 
-- 
1.6.3.3

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

[Philip Balister]

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"
>

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

[Cory Maccarrone]

On Sat, Dec 5, 2009 at 12:25 PM, Philip Balister <philip@balister.org> wrote:
> 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?
>

I haven't noticed any issues with icu-native -- I was building the
openmoko image when I encountered this, and for me this patch was
enough to get it compiling again.  I've confirmed that both icu and
icu-native compiled fine for me after this patch is added.

- Cory

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

[Philip Balister]

On 12/05/2009 03:47 PM, Cory Maccarrone wrote:
> On Sat, Dec 5, 2009 at 12:25 PM, Philip Balister<philip@balister.org>  wrote:
>> 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?
>>
>
> I haven't noticed any issues with icu-native -- I was building the
> openmoko image when I encountered this, and for me this patch was
> enough to get it compiling again.  I've confirmed that both icu and
> icu-native compiled fine for me after this patch is added.

I had to clean icu-native also after making sure the problem was real. 
Hn it builds, I'll acck, apply, and push.

Philip

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

[Philip Balister]

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
>
> Signed-off-by: Cory Maccarrone<darkstar6262@gmail.com>

Acked-by: Philip Balister <philip@balister.org>

When I push this, I'll will add another patch adding INC_PR to the 
recipe. In the future bump the PR to force rebuilds. I had to manually 
clean the icu-native recipe after duplicating the original failure.

Philip

> ---
>   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"
>