diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-04-04 14:13:08 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:54:51 +0100 |
commit | 182f096210d74d44dd452f2b3f09ec0c3c75f074 (patch) | |
tree | d1a0f4db698cbd634c693126312e08f74f46f67d /meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |
parent | e974ce6e4d3c54cde5b43c9056c649bb98ed69f5 (diff) | |
download | openembedded-core-contrib-182f096210d74d44dd452f2b3f09ec0c3c75f074.tar.gz |
webkitgtk: update to 2.20.0
Rebase patches, remove a couple of upstreamed patches.
Add an option to enable woff2 font library (not currently packaged by oe).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index 896890b433..aa9a06701a 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -1,7 +1,7 @@ -From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 +From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 29 Aug 2016 16:38:11 +0300 -Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir +Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -11,39 +11,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index a33c6a86..d83a2e77 100644 +index a074a80..8c6ebb5 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -1122,8 +1122,9 @@ endif () - string(REGEX MATCHALL "-L[^ ]*" - INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION) + string(REGEX MATCHALL "-L[^ ]*" + INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") --add_custom_command( -- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+# This is a target and not a command because it's used to build another .gir -+# and a .typelib, which would trigger two racy parallel builds when using command -+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir - DEPENDS WebKit2 - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -1168,7 +1169,7 @@ add_custom_command( - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} - LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" - ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -1225,7 +1226,7 @@ add_custom_command( +- add_custom_command( +- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ # This is a target and not a command because it's used to build another .gir ++ # and a .typelib, which would trigger two racy parallel builds when using command ++ add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir + DEPENDS WebKit + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= +@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} + LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" +@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib -- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir - COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib - ) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib + ) --- -2.14.1 - |