aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCory Maccarrone <darkstar6262@gmail.com>2009-12-05 09:00:02 +0000
committerPhilip Balister <philip@balister.org>2009-12-07 08:56:03 -0500
commit9d3723317f2f825e7dca866bbc74029dcf1396f1 (patch)
tree5ef5a87d38f1b2d9b63f8e5ee3932ec9197a6c18
parent4e4d5bffce93d0033c3814fabf47005356d51cb2 (diff)
downloadopenembedded-9d3723317f2f825e7dca866bbc74029dcf1396f1.tar.gz
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@gmail.com> Acked-by: Philip Balister <philip@balister.org>
-rw-r--r--recipes/icu/files/fix-elif-expression.patch11
-rw-r--r--recipes/icu/icu-3.6.inc3
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 0000000000..6021beed9d
--- /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 04fc8420ab..aaacd836cf 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"