icu: Add patch to fix issue with #elif and recent gcc versions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

4 files changed, 18 insertions, 2 deletions

diff --git a/meta/packages/icu/files/gccfix.patch b/meta/packages/icu/files/gccfix.patch
new file mode 100644
index 0000000000..9291e921d3
--- /dev/null
+++ b/meta/packages/icu/files/gccfix.patch
@@ -0,0 +1,13 @@
+Index: source/layoutex/ParagraphLayout.cpp
+===================================================================
+--- source.orig/layoutex/ParagraphLayout.cpp    2009-06-30 11:48:47.000000000 +0100
++++ source/layoutex/ParagraphLayout.cpp 2009-06-30 11:49:06.000000000 +0100
+@@ -798,7 +798,7 @@
+ 
+     return nullLanguageCode;
+ }
+-#elif
++#else
+ 
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index ec95cabb84..b5116aaced 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/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://gccfix.patch;patch=1"
 
 S = "${WORKDIR}/icu/source"
 
diff --git a/meta/packages/icu/icu-native_3.6.bb b/meta/packages/icu/icu-native_3.6.bb
index 887bfcac2f..90dd0c9378 100644
--- a/meta/packages/icu/icu-native_3.6.bb
+++ b/meta/packages/icu/icu-native_3.6.bb
@@ -1,3 +1,5 @@
 require icu-3.6.inc
 
 inherit native
+
+PR = "r1"
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
index 91b25adbe9..b81376f469 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/packages/icu/icu_3.6.bb
@@ -1,7 +1,7 @@
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://use-g++-for-linking.patch;patch=1"