[oe-commits] Cory Maccarrone : icu: Add patch for dangling #elif expression

[git version control]

Module: openembedded.git
Branch: stable/2009
Commit: 9d3723317f2f825e7dca866bbc74029dcf1396f1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9d3723317f2f825e7dca866bbc74029dcf1396f1

Author: Cory Maccarrone <darkstar6262 at gmail.com>
Date:   Sat Dec  5 09:00:02 2009 +0000

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

Signed-off-by: Cory Maccarrone <darkstar6262 at gmail.com>
Acked-by: Philip Balister <philip at balister.org>

---

 recipes/icu/files/fix-elif-expression.patch |   11 +++++++++++
 recipes/icu/icu-3.6.inc                     |    3 ++-
 2 files changed, 13 insertions(+), 1 deletions(-)

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"