diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-02-28 16:36:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-02 14:15:33 +0000 |
commit | de8475d206d6b17c6b7907ed06f73c6586cf4f48 (patch) | |
tree | 335c46bdb690f234d2813c0235e758ba64681346 /meta/recipes-sato/webkit | |
parent | a0c3cf90f4bb62712cb969dc8a9faffd60ff677c (diff) | |
download | poky-de8475d206d6b17c6b7907ed06f73c6586cf4f48.tar.gz |
webkitgtk: update 2.30.4 -> 2.30.5
(From OE-Core rev: 192a3308cc0bd7f200e2f9aef759c90f54dd090b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 14 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.30.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.30.4.bb) | 2 |
2 files changed, 8 insertions, 8 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 aa9a06701a..0c31c5fa21 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,4 +1,4 @@ | |||
1 | From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001 | 1 | From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | 3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 |
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | 4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir |
@@ -11,12 +11,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 5 insertions(+), 4 deletions(-) | 11 | 1 file changed, 5 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | 13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
14 | index a074a80..8c6ebb5 100644 | 14 | index a069c5f6..ea2f542b 100644 |
15 | --- a/Source/WebKit/PlatformGTK.cmake | 15 | --- a/Source/WebKit/PlatformGTK.cmake |
16 | +++ b/Source/WebKit/PlatformGTK.cmake | 16 | +++ b/Source/WebKit/PlatformGTK.cmake |
17 | @@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION) | 17 | @@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) |
18 | string(REGEX MATCHALL "-L[^ ]*" | 18 | set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") |
19 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") | 19 | endif () |
20 | 20 | ||
21 | - add_custom_command( | 21 | - add_custom_command( |
22 | - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 22 | - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
@@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644 | |||
26 | DEPENDS WebKit | 26 | DEPENDS WebKit |
27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | 28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
29 | @@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION) | 29 | @@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) |
30 | add_custom_command( | 30 | add_custom_command( |
31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644 | |||
35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | 35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
38 | @@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION) | 38 | @@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) |
39 | 39 | ||
40 | add_custom_command( | 40 | add_custom_command( |
41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | 41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib |
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb index a16a676d7a..2928b8e55b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
19 | file://include_array.patch \ | 19 | file://include_array.patch \ |
20 | file://include_xutil.patch \ | 20 | file://include_xutil.patch \ |
21 | " | 21 | " |
22 | SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24" | 22 | SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f" |
23 | 23 | ||
24 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc | 24 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc |
25 | 25 | ||