summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-07-02 09:15:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-04 00:02:16 +0100
commit9267988e3036d627a4bad12102b455a53cb6501a (patch)
tree3a606a533e2f558bfca17ab2c55d63e6215ac78f
parent8342cc7d2f00d6f881fd4e578f057859cffaa609 (diff)
downloadpoky-9267988e3036d627a4bad12102b455a53cb6501a.tar.gz
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>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch12
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch43
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.20.3.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.20.2.bb)5
3 files changed, 8 insertions, 52 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
index 034219f826..b31026448c 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -41,18 +41,18 @@ index b3c7e0b..88446de 100644
41 target_link_libraries(jsc ${JSC_LIBRARIES}) 41 target_link_libraries(jsc ${JSC_LIBRARIES})
42 42
43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake 43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
44index 32c6ccc..fef5e8b 100644 44index f7d8d70a..3c27b8bc 100644
45--- a/Source/WebCore/PlatformGTK.cmake 45--- a/Source/WebCore/PlatformGTK.cmake
46+++ b/Source/WebCore/PlatformGTK.cmake 46+++ b/Source/WebCore/PlatformGTK.cmake
47@@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 47@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
48 ${GTK2_INCLUDE_DIRS} 48 target_include_directories(WebCorePlatformGTK2 PRIVATE
49 ${GDK2_INCLUDE_DIRS} 49 ${WebCore_INCLUDE_DIRECTORIES}
50 ) 50 )
51- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE 51- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
52+ target_include_directories(WebCorePlatformGTK2 PRIVATE 52+ target_include_directories(WebCorePlatformGTK2 PRIVATE
53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
54 ) 54 ${GTK2_INCLUDE_DIRS}
55 target_link_libraries(WebCorePlatformGTK2 55 ${GDK2_INCLUDE_DIRS}
56@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) 56@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
57 target_include_directories(WebCorePlatformGTK PRIVATE 57 target_include_directories(WebCorePlatformGTK PRIVATE
58 ${WebCore_INCLUDE_DIRECTORIES} 58 ${WebCore_INCLUDE_DIRECTORIES}
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
deleted file mode 100644
index bbdb64490a..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From d907ac649ff5514826af9ad7e97e15dfcf79909c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 17 May 2017 22:34:24 -0700
4Subject: [PATCH] webkitgtk: Fix build for armv5
5
6Taken from
7https://bugs.webkit.org/show_bug.cgi?id=161900
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 Source/WTF/wtf/CMakeLists.txt | 10 +++++++++-
14 1 file changed, 9 insertions(+), 1 deletion(-)
15
16diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
17index 220bafd..4e1e9f8 100644
18--- a/Source/WTF/wtf/CMakeLists.txt
19+++ b/Source/WTF/wtf/CMakeLists.txt
20@@ -315,7 +315,6 @@ set(WTF_HEADERS
21
22 set(WTF_SOURCES
23 Assertions.cpp
24- Atomics.cpp
25 AutomaticThread.cpp
26 BitVector.cpp
27 CPUTime.cpp
28@@ -458,6 +457,15 @@ if (NOT USE_SYSTEM_MALLOC)
29 list(APPEND WTF_LIBRARIES bmalloc)
30 endif ()
31
32+file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp
33+ "int main(void)\n"
34+ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n")
35+try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp)
36+if (NOT ATOMICS_BUILD_SUCCEEDED)
37+ list(APPEND WTF_SOURCES Atomics.cpp)
38+endif ()
39+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
40+
41 list(APPEND WTF_SOURCES
42 unicode/CollatorDefault.cpp
43
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
index a68a69f43c..9d0f00a6d6 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
@@ -17,15 +17,14 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
17 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ 17 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
18 file://x32_support.patch \ 18 file://x32_support.patch \
19 file://cross-compile.patch \ 19 file://cross-compile.patch \
20 file://detect-atomics-during-configure.patch \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \ 21 file://0001-Fix-build-with-musl.patch \
23 file://detect-gstreamer-gl.patch \ 22 file://detect-gstreamer-gl.patch \
24 file://0012-soup-Forward-declare-URL-class.patch \ 23 file://0012-soup-Forward-declare-URL-class.patch \
25 " 24 "
26 25
27SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967" 26SRC_URI[md5sum] = "efb69a0cc3cc67ef2647efec22e44c69"
28SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2" 27SRC_URI[sha256sum] = "579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8"
29 28
30inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 29inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
31 30