icu: Add patch for dangling #elif expression
PATCH 1/1 icu: Add patch for dangling #elif expression
This change adds a patch that fixes a compile error in source/layoutex/ParagraphLayout.cpp caused by an
--- 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
recipes/icu/files/fix-elif-expression.patch new file +11 -0
@@ -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)
recipes/icu/icu-3.6.inc +2 -1
@@ -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"
Signature · 1 line
1.6.3.3
Quoted 2 lines · Cory Maccarrone
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
Quoted 39 lines
Signed-off-by Cory Maccarrone<[email protected]>--- 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.patchrecipes/icu/files/fix-elif-expression.patch new file +11
-0@@ -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)recipes/icu/icu-3.6.inc +2
-1@@ -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"
Quoted 8 lines · Philip Balister
Quoted 3 lines · Cory Maccarrone
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
Quoted 6 lines · Cory Maccarrone
Quoted 5 lines · Philip Balister
Quoted 3 lines · Cory Maccarrone
This change adds a patch that fixes a compile error in source/layoutex/ParagraphLayout.cpp caused by an
Quoted 8 lines
Quoted 3 lines
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
Quoted 4 lines · 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<[email protected]>
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
Quoted 37 lines
--- 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.patchrecipes/icu/files/fix-elif-expression.patch new file +11
-0@@ -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)recipes/icu/icu-3.6.inc +2
-1@@ -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"