From 5e7476166cb22fc1a34754451c5cc52bf036271f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 12 Jan 2014 15:13:11 +0100 Subject: webkit-efl: Add recipe with snapshot from r159807 * announcement: http://sourceforge.net/mailarchive/message.php?msg_id=31742684 Signed-off-by: Martin Jansa --- ...lines.h-remove-indexingHeader-preCapacity.patch | 27 ++++++++++++ ...KitHelpers.cmake-Add-Wno-error-cast-align.patch | 29 +++++++++++++ .../webkit/webkit-efl/gcc-4.8.2.fix.patch | 15 +++++++ .../webkit/webkit-efl_2.3.2+svnr159807.bb | 48 ++++++++++++++++++++++ 4 files changed, 119 insertions(+) create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch new file mode 100644 index 0000000000..003a1d17a9 --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch @@ -0,0 +1,27 @@ +From 5b9bbf9c056e3690e2872cc74a8962ec6a21a020 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 13 Jan 2014 19:00:46 +0100 +Subject: [PATCH] ButterflyInlines.h: remove + !indexingHeader()->preCapacity(oldStructure) + +Signed-off-by: Martin Jansa +--- + Source/JavaScriptCore/runtime/ButterflyInlines.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/runtime/ButterflyInlines.h b/Source/JavaScriptCore/runtime/ButterflyInlines.h +index f5439bb..d5c828f 100644 +--- a/Source/JavaScriptCore/runtime/ButterflyInlines.h ++++ b/Source/JavaScriptCore/runtime/ButterflyInlines.h +@@ -128,7 +128,7 @@ inline Butterfly* Butterfly::growArrayRight( + bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes, + size_t newIndexingPayloadSizeInBytes) + { +- ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure)); ++// ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure)); + ASSERT_UNUSED(oldStructure, hadIndexingHeader == oldStructure->hasIndexingHeader(intendedOwner)); + void* theBase = base(0, propertyCapacity); + size_t oldSize = totalSize(0, propertyCapacity, hadIndexingHeader, oldIndexingPayloadSizeInBytes); +-- +1.8.5.2 + 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 new file mode 100644 index 0000000000..5df0f8ad0a --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch @@ -0,0 +1,29 @@ +From bfabbcab5dc4fe29bc91bbfbd9c9a404a3e2538b Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 13 Jan 2014 17:21:25 +0100 +Subject: [PATCH] WebKitHelpers.cmake: Add -Wno-error=cast-align + +Signed-off-by: Martin Jansa +--- + Source/cmake/WebKitHelpers.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake +index 1e51ebc..d813117 100644 +--- a/Source/cmake/WebKitHelpers.cmake ++++ b/Source/cmake/WebKitHelpers.cmake +@@ -42,7 +42,10 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target) + + # Enable errors on warning + if (OPTION_ENABLE_WERROR) +- set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}") ++ # /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h: In member function 'void WebCore::OpenTypeVerticalData::substituteWithVerticalGlyphs(const WebCore::SimpleFontData*, WebCore::GlyphPage*, unsigned int, unsigned int) const': /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h:120:30: error: array subscript is above array bounds [-Werror=array-bounds] ++ # | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:13:50: error: 'GType soup_proxy_uri_resolver_get_type()' is deprecated (declared at /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:48) [-Werror=deprecated-declarations] ++ # | /OE/build/shr-core/tmp-eglibc/work/cortexa8-vfp-neon-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:120:133: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::IntegralTypedArrayAdaptor, JSC::JSGenericTypedArrayView, (JSC::TypedArrayType)4u>::Type* {aka short int*}' increases required alignment of target type [-Werror=cast-align] ++ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=array-bounds -Wno-error=deprecated-declarations -Wno-error=cast-align ${OLD_COMPILE_FLAGS}") + endif () + + # Disable C++0x compat warnings for GCC >= 4.6.0 until we build +-- +1.8.5.2 + diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch b/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch new file mode 100644 index 0000000000..635c1cb1f4 --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch @@ -0,0 +1,15 @@ +Upstream-Status: Backport http://trac.webkit.org/changeset/160834 + +Signed-off-by: Martin Jansa + +Index: a/Source/WTF/wtf/dtoa/double-conversion.cc +=================================================================== +--- a/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160833) ++++ b/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160834) +@@ -447,5 +447,5 @@ + const int kBufferSize = kMaxSignificantDigits + 10; + char buffer[kBufferSize]; // NOLINT: size is known at compile time. +- int buffer_pos = 0; ++ unsigned buffer_pos = 0; + + // Exponent will be adjusted if insignificant digits of the integer part diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb new file mode 100644 index 0000000000..879ff1f232 --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Webkit browser engine, EFL edition" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebKit/efl/ewk/EWebKit.h;endline=20;md5=55ea170b1582797d2c69712de850f2fa \ +" + +# you need harfbuzz with icu enabled, you can add this to your config: +# PACKAGECONFIG_append_pn-harfbuzz = " icu" +DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \ + libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \ + libxml2 pango eina ecore evas edje eldbus harfbuzz enchant \ + ruby-native" + +SRC_URI = "\ + ${E_RELEASES}/libs/webkit-efl/webkit-efl-159807.tar.xz \ + file://gcc-4.8.2.fix.patch \ + file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \ + file://0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch \ +" +SRC_URI[md5sum] = "3e1377d976460dd14db0dd3cd39b8e48" +SRC_URI[sha256sum] = "a99531299e41ba4671b32bbf46c3efc4d65960c9c87949a87f76e622c284f178" + +S = "${WORKDIR}/${BPN}" + +inherit cmake lib_package pkgconfig perlnative pythonnative + +ARM_INSTRUCTION_SET = "arm" + +EXTRA_OECMAKE = " \ + -DPORT=Efl \ + -DSHARED_CORE=On \ + -DENABLE_DRAG_SUPPORT=On \ + -DENABLE_WEB_AUDIO=Off \ + -DENABLE_VIDEO=Off \ + -DENABLE_VIDEO_TRACK=Off \ + -DENABLE_ACCESSIBILITY=Off \ + -DENABLE_BATTERY_STATUS=Off \ +" + +LEAD_SONAME = "libewebkit.so" +PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector" + +FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj" +FILES_${PN}-dev += "${libdir}/cmake" +FILES_${PN}launcher = "${bindir}/EWebLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher" +FILES_${PN}-inspector += "${datadir}/ewebkit-0/inspector" -- cgit 1.2.3-korg