diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 13:22:49 +0000 |
commit | 3846c15172cd8ecba47e421a31034dc3c198c4c8 (patch) | |
tree | a557b7eb8753fca4138a9d5e764fa16ebc34adcb /meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | |
parent | 9624092cd61bdde9bcef3361cff898282e50dcae (diff) | |
download | poky-3846c15172cd8ecba47e421a31034dc3c198c4c8.tar.gz |
webkitgtk: update 2.28.4 -> 2.30.1
Drop 0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch and
cross-compile.patch as upstream has removed the code.
Rebase 0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch.
Add a systemd config option, subject to systemd in DISTRO_FEATURES.
(From OE-Core rev: 98d7a2b593eee33e0bc015778712cd8b68146588)
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/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch index 268118b5ca..ca7b1bca48 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 | 1 | From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 3 Feb 2020 17:06:27 -0800 | 3 | Date: Mon, 3 Feb 2020 17:06:27 -0800 |
4 | Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG | 4 | Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG |
@@ -13,26 +13,26 @@ missing atomic primitives. | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] | 14 | Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] |
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
16 | |||
16 | --- | 17 | --- |
17 | Source/cmake/OptionsGTK.cmake | 2 ++ | 18 | Source/cmake/OptionsGTK.cmake | 1 + |
18 | Source/cmake/OptionsJSCOnly.cmake | 1 + | 19 | Source/cmake/OptionsJSCOnly.cmake | 1 + |
19 | 2 files changed, 3 insertions(+) | 20 | 2 files changed, 2 insertions(+) |
20 | 21 | ||
21 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake | 22 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake |
22 | index d3beef19..6a92856f 100644 | 23 | index 8732e935..9b4fbae7 100644 |
23 | --- a/Source/cmake/OptionsGTK.cmake | 24 | --- a/Source/cmake/OptionsGTK.cmake |
24 | +++ b/Source/cmake/OptionsGTK.cmake | 25 | +++ b/Source/cmake/OptionsGTK.cmake |
25 | @@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT | 26 | @@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") |
26 | set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") | 27 | if (USER_AGENT_BRANDING) |
27 | set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") | 28 | add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}") |
28 | 29 | endif () | |
29 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | 30 | +set(THREADS_PREFER_PTHREAD_FLAG ON) |
30 | + | 31 | |
31 | find_package(Cairo 1.14.0 REQUIRED) | 32 | find_package(Cairo 1.14.0 REQUIRED) |
32 | find_package(Fontconfig 2.8.0 REQUIRED) | 33 | find_package(Fontconfig 2.8.0 REQUIRED) |
33 | find_package(Freetype 2.4.2 REQUIRED) | ||
34 | diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake | 34 | diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake |
35 | index b2e87418..326ade23 100644 | 35 | index 316c6240..2f712602 100644 |
36 | --- a/Source/cmake/OptionsJSCOnly.cmake | 36 | --- a/Source/cmake/OptionsJSCOnly.cmake |
37 | +++ b/Source/cmake/OptionsJSCOnly.cmake | 37 | +++ b/Source/cmake/OptionsJSCOnly.cmake |
38 | @@ -1,3 +1,4 @@ | 38 | @@ -1,3 +1,4 @@ |
@@ -40,6 +40,3 @@ index b2e87418..326ade23 100644 | |||
40 | find_package(Threads REQUIRED) | 40 | find_package(Threads REQUIRED) |
41 | 41 | ||
42 | if (MSVC) | 42 | if (MSVC) |
43 | -- | ||
44 | 2.25.0 | ||
45 | |||