mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
a0c3cf90f4
commit
de8475d206
@@ -1,4 +1,4 @@
|
||||
From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
|
||||
From 4718888071e29deb8b245b88c81577fd5bac4e5e 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] Fix racy parallel build of WebKit2-4.0.gir
|
||||
@@ -11,12 +11,12 @@ 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 a074a80..8c6ebb5 100644
|
||||
index a069c5f6..ea2f542b 100644
|
||||
--- a/Source/WebKit/PlatformGTK.cmake
|
||||
+++ b/Source/WebKit/PlatformGTK.cmake
|
||||
@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
|
||||
string(REGEX MATCHALL "-L[^ ]*"
|
||||
INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
|
||||
set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
|
||||
endif ()
|
||||
|
||||
- add_custom_command(
|
||||
- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
@@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644
|
||||
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)
|
||||
@@ -699,7 +700,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
|
||||
@@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644
|
||||
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)
|
||||
@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
|
||||
|
||||
@@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://include_array.patch \
|
||||
file://include_xutil.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24"
|
||||
SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f"
|
||||
|
||||
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
|
||||
|
||||
Reference in New Issue
Block a user