webkit-efl: Fix type-limits warning

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 34 insertions, 1 deletions

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
index 864b9c914..c769c7fbb 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
@@ -20,7 +20,7 @@ index 409931c..345b346 100644
 +            # FIXME: When we use -fno-tree-dce to support the jsCStack branch merge, build error occurs due to the uninitialization. Temporarily we set
 +            # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777.
 +            set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized ${OLD_COMPILE_FLAGS}")
-+           # | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:161:104: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::FloatTypedArrayAdaptor<double, JSC::GenericTypedArrayView<JSC::Float64Adaptor>, JSC::JSGenericTypedArrayView<JSC::Float64Adaptor>, (JSC::TypedArrayType)9u>::Type* {aka double*}' increases required alignment of target type [-Werror=cast-align]
++            # | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:161:104: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::FloatTypedArrayAdaptor<double, JSC::GenericTypedArrayView<JSC::Float64Adaptor>, JSC::JSGenericTypedArrayView<JSC::Float64Adaptor>, (JSC::TypedArrayType)9u>::Type* {aka double*}' increases required alignment of target type [-Werror=cast-align]
 +            set(OLD_COMPILE_FLAGS "-Wno-error=cast-align -Wno-error=array-bounds -Wno-error=deprecated-declarations ${OLD_COMPILE_FLAGS}")
          endif ()
  
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch
new file mode 100644
index 000000000..f30987ba3
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch
@@ -0,0 +1,32 @@
+From ed7972510df191d9fabe7aff2f688cbc45f0c955 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 20 Jul 2014 10:52:17 +0200
+Subject: [PATCH] WebMemorySamplerLinux: Fix type-limits warning
+
+* otherwise it fails with:
+  webkit-efl/2.3.4+svnr164189-r0/efl-webkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70:16:
+  error: comparison is always false due to limited range of data type [-Werror=type-limits]
+  |          if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
+  |                 ^
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
+index 7cb70d4..6bb78d8 100644
+--- a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
++++ b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
+@@ -67,7 +67,7 @@ static inline String nextToken(FILE* file)
+     unsigned int index = 0;
+     while (index < maxBuffer) {
+         char ch = fgetc(file);
+-        if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
++        if (isASCIISpace(ch) && index) // Break on non-initial ASCII space.
+             break;
+         if (!isASCIISpace(ch)) {
+             buffer[index] = ch;
+-- 
+2.0.0
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
index 65418ca9a..748ecea11 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
@@ -5,6 +5,7 @@ SRC_URI = "\
     file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
     file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
     file://0003-Fix-linking-issue.patch \
+    file://0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch \
 "
 SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
 SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"