mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
webkitgtk: 2.20.2 -> 2.20.3
Upgrade webkitgtk from 2.20.2 to 2.20.3. * update context of 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch * remove detect-atomics-during-configure.patch that webkitgtk 2.20.3 contains the commit of better solution, see https://bugs.webkit.org/show_bug.cgi?id=161900#c9 (From OE-Core rev: 069426b0a7a6848a9290cd2e8cdce941d7e3c08c) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -41,18 +41,18 @@ index b3c7e0b..88446de 100644
|
||||
target_link_libraries(jsc ${JSC_LIBRARIES})
|
||||
|
||||
diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
|
||||
index 32c6ccc..fef5e8b 100644
|
||||
index f7d8d70a..3c27b8bc 100644
|
||||
--- a/Source/WebCore/PlatformGTK.cmake
|
||||
+++ b/Source/WebCore/PlatformGTK.cmake
|
||||
@@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
|
||||
${GTK2_INCLUDE_DIRS}
|
||||
${GDK2_INCLUDE_DIRS}
|
||||
@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
|
||||
target_include_directories(WebCorePlatformGTK2 PRIVATE
|
||||
${WebCore_INCLUDE_DIRECTORIES}
|
||||
)
|
||||
- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
|
||||
+ target_include_directories(WebCorePlatformGTK2 PRIVATE
|
||||
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
|
||||
)
|
||||
target_link_libraries(WebCorePlatformGTK2
|
||||
${GTK2_INCLUDE_DIRS}
|
||||
${GDK2_INCLUDE_DIRS}
|
||||
@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
|
||||
target_include_directories(WebCorePlatformGTK PRIVATE
|
||||
${WebCore_INCLUDE_DIRECTORIES}
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From d907ac649ff5514826af9ad7e97e15dfcf79909c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 17 May 2017 22:34:24 -0700
|
||||
Subject: [PATCH] webkitgtk: Fix build for armv5
|
||||
|
||||
Taken from
|
||||
https://bugs.webkit.org/show_bug.cgi?id=161900
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
Source/WTF/wtf/CMakeLists.txt | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
|
||||
index 220bafd..4e1e9f8 100644
|
||||
--- a/Source/WTF/wtf/CMakeLists.txt
|
||||
+++ b/Source/WTF/wtf/CMakeLists.txt
|
||||
@@ -315,7 +315,6 @@ set(WTF_HEADERS
|
||||
|
||||
set(WTF_SOURCES
|
||||
Assertions.cpp
|
||||
- Atomics.cpp
|
||||
AutomaticThread.cpp
|
||||
BitVector.cpp
|
||||
CPUTime.cpp
|
||||
@@ -458,6 +457,15 @@ if (NOT USE_SYSTEM_MALLOC)
|
||||
list(APPEND WTF_LIBRARIES bmalloc)
|
||||
endif ()
|
||||
|
||||
+file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp
|
||||
+ "int main(void)\n"
|
||||
+ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n")
|
||||
+try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp)
|
||||
+if (NOT ATOMICS_BUILD_SUCCEEDED)
|
||||
+ list(APPEND WTF_SOURCES Atomics.cpp)
|
||||
+endif ()
|
||||
+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
|
||||
+
|
||||
list(APPEND WTF_SOURCES
|
||||
unicode/CollatorDefault.cpp
|
||||
|
||||
@@ -17,15 +17,14 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
|
||||
file://x32_support.patch \
|
||||
file://cross-compile.patch \
|
||||
file://detect-atomics-during-configure.patch \
|
||||
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
|
||||
file://0001-Fix-build-with-musl.patch \
|
||||
file://detect-gstreamer-gl.patch \
|
||||
file://0012-soup-Forward-declare-URL-class.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967"
|
||||
SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2"
|
||||
SRC_URI[md5sum] = "efb69a0cc3cc67ef2647efec22e44c69"
|
||||
SRC_URI[sha256sum] = "579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8"
|
||||
|
||||
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
|
||||
|
||||
Reference in New Issue
Block a user