summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-18 16:29:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:17 +0000
commit9988ab36b41abf00cd79f671aa84bbcc4f8e540d (patch)
tree0ebf9714d3e1df5b9776845777ae1d37caf0ce48
parentcedb02737298735a18b977b33f4ad3c4ed330619 (diff)
downloadpoky-9988ab36b41abf00cd79f671aa84bbcc4f8e540d.tar.gz
webkitgtk: update to 2.10.4
Drop backported patches (which means, all the patches). Replace a few hardcoded dependencies with PACKAGECONFIG entries. Add a PACKAGECONFIG entry for libhyphen. (From OE-Core rev: 3c5485d629e261f27d9c4ad492224a5e376ff0a4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch91
-rw-r--r--meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch35
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/gcc5.patch26
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.10.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.8.5.bb)20
4 files changed, 11 insertions, 161 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch b/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
deleted file mode 100644
index 28b3420537..0000000000
--- a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1From 22d5063c551d3c08c0a4ad8b80e08b793d53093d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 10 Sep 2015 16:23:27 +0300
4Subject: [PATCH] This patch fixes a command line that is too long (over 100K!)
5 and is rejected by /bin/sh.
6
7Upstream-Status: Backport [should appear in 2.10, http://trac.webkit.org/changeset/184856]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 Source/WebKit2/PlatformGTK.cmake | 11 ++++++-----
12 Tools/gtk/generate-inspector-gresource-manifest.py | 16 ++++++++++++----
13 2 files changed, 18 insertions(+), 9 deletions(-)
14
15diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
16index a13af7c..058c241 100644
17--- a/Source/WebKit2/PlatformGTK.cmake
18+++ b/Source/WebKit2/PlatformGTK.cmake
19@@ -408,7 +408,7 @@ set(WebKit2WebExtension_INSTALLED_HEADERS
20 ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
21 )
22
23-file(GLOB InspectorFiles
24+set(InspectorFiles
25 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
26 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
27 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
28@@ -423,13 +423,14 @@ file(GLOB InspectorFiles
29 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
30 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
31 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
32-)
33-
34-list(APPEND InspectorFiles
35 ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
36 ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
37 )
38
39+file(GLOB InspectorFilesDependencies
40+ ${InspectorFiles}
41+)
42+
43 # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
44 list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
45 "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
46@@ -564,7 +565,7 @@ add_custom_command(
47
48 add_custom_command(
49 OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
50- DEPENDS ${InspectorFiles}
51+ DEPENDS ${InspectorFilesDependencies}
52 ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
53 COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles}
54 VERBATIM
55diff --git a/Tools/gtk/generate-inspector-gresource-manifest.py b/Tools/gtk/generate-inspector-gresource-manifest.py
56index 0687c4c..03060cf 100755
57--- a/Tools/gtk/generate-inspector-gresource-manifest.py
58+++ b/Tools/gtk/generate-inspector-gresource-manifest.py
59@@ -16,6 +16,7 @@
60 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
61
62 import argparse
63+import glob
64 import os
65 import sys
66
67@@ -26,10 +27,17 @@ BASE_DIR = 'WebInspectorUI/'
68 def get_filenames(args):
69 filenames = []
70
71- for filename in args:
72- base_dir_index = filename.rfind(BASE_DIR)
73- if base_dir_index != -1:
74- filenames.append(filename[base_dir_index + len(BASE_DIR):])
75+ for pattern in args:
76+ paths = glob.glob(pattern)
77+ for filename in paths:
78+ base_dir_index = filename.rfind(BASE_DIR)
79+ if base_dir_index != -1:
80+ name = filename[base_dir_index + len(BASE_DIR):]
81+ # The result should use forward slashes, thus make sure any os-specific
82+ # separator, added by the glob.glob() call, is properly replaced
83+ if os.sep != '/':
84+ name = name.replace(os.sep, '/')
85+ filenames.append(name)
86 return filenames
87
88
89--
902.1.4
91
diff --git a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch b/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch
deleted file mode 100644
index e95c0e4a22..0000000000
--- a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 6ea42d4fa6f3f6dd18c37cb7b6e1faea6afefba4 Mon Sep 17 00:00:00 2001
2From: "clopez@igalia.com" <clopez@igalia.com>
3Date: Tue, 15 Sep 2015 21:50:18 +0000
4Subject: [PATCH] [GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has
5 built with OpenGLESv2 support only.
6
7When cairo-gl is built with GLX and ACCELERATED_2D_CANVAS if cairo-gl was only
8built with OpenGLESv2, cairo-glx is not enabled causing
9Source/WebCore/platform/graphics/glx/GLContextGLX.cpp to reference an undeclared
10function and cause a compliation error. Adding an extra check resolves this
11build failure.
12
13Upstream-Status: Backport [webkit-2.10.0]
14
15Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com>
16---
17 Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp
21index 7890d8d..4ed3a43 100644
22--- a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp
23+++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp
24@@ -266,7 +266,7 @@ cairo_device_t* GLContextGLX::cairoDevice()
25 if (m_cairoDevice)
26 return m_cairoDevice;
27
28-#if ENABLE(ACCELERATED_2D_CANVAS)
29+#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS
30 m_cairoDevice = cairo_glx_device_create(sharedX11Display(), m_context);
31 #endif
32
33--
342.6.2
35
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
deleted file mode 100644
index 5951a81f34..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes
2
3Reason for change: newer gcc might optimize away the templates
4and they wont be available for other .cpp files to use as these
5are used in a different .cpp we need to tell compiler to explicitly
6instantiate them.
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11
12Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp
13===================================================================
14--- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp
15+++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp
16@@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen
17 }
18 }
19
20+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
21+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
22+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
23+
24 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
25 {
26 VM& vm = exec->vm();
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb
index aa5e6c9c0a..4d5aeb48eb 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb
@@ -12,27 +12,28 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
12 12
13SRC_URI = "\ 13SRC_URI = "\
14 http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ 14 http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
15 file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \
16 file://0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch \
17 file://gcc5.patch \
18 " 15 "
19SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" 16SRC_URI[md5sum] = "fb010031c6f61c3a1a00793b112badb5"
20SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" 17SRC_URI[sha256sum] = "dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055"
21 18
22inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even 19inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even
23 20
24# depends on libxt 21# depends on libxt
25REQUIRED_DISTRO_FEATURES = "x11" 22REQUIRED_DISTRO_FEATURES = "x11"
26 23
27DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ 24DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
28 gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ 25 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
29 pango icu bison-native gnome-common gawk intltool-native libwebp \ 26 pango icu bison-native gnome-common gawk intltool-native libwebp \
30 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ 27 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
31 ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ 28 ruby-native libnotify gstreamer1.0-plugins-bad \
32 " 29 "
33 30
34PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ 31PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
35 ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)}" 32 ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
33 enchant \
34 gtk2 \
35 libsecret \
36 "
36 37
37PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" 38PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
38PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" 39PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
@@ -42,6 +43,7 @@ PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_G
42PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" 43PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
43PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" 44PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
44PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" 45PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret"
46PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
45 47
46EXTRA_OECMAKE = " \ 48EXTRA_OECMAKE = " \
47 -DPORT=GTK \ 49 -DPORT=GTK \