diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-07-14 14:26:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-16 21:23:44 +0100 |
commit | a6c28fb87eb645bbdff7dc7a15664475ae6f1f13 (patch) | |
tree | a04b2ad3fb546834ab031748825dd8670d695384 /meta/recipes-sato | |
parent | 0869f6b3b2ed3de1a54a86ddac0dc4752713d982 (diff) | |
download | poky-a6c28fb87eb645bbdff7dc7a15664475ae6f1f13.tar.gz |
webkitgtk: upgrade 2.32.1 -> 2.32.2
(From OE-Core rev: 6a1bbc8c9758a201a5bf1901890e789d869c618d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 6 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.32.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.32.1.bb) | 2 |
2 files changed, 4 insertions, 4 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 efe286ed6b..21828a7ecf 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 af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001 | 1 | From 1a7becde0e508d7fac488bae6c08c1a4a0ac6b73 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 |
@@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | 2 files changed, 2 insertions(+) | 20 | 2 files changed, 2 insertions(+) |
21 | 21 | ||
22 | 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 |
23 | index af6c0fac..f393d741 100644 | 23 | index 1f500299..0771af9c 100644 |
24 | --- a/Source/cmake/OptionsGTK.cmake | 24 | --- a/Source/cmake/OptionsGTK.cmake |
25 | +++ b/Source/cmake/OptionsGTK.cmake | 25 | +++ b/Source/cmake/OptionsGTK.cmake |
26 | @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() | 26 | @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() |
27 | SET_PROJECT_VERSION(2 32 1) | 27 | SET_PROJECT_VERSION(2 32 2) |
28 | 28 | ||
29 | set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") | 29 | set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") |
30 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | 30 | +set(THREADS_PREFER_PTHREAD_FLAG ON) |
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb index 7abf96c252..96b6cab49c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
22 | file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ | 22 | file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917" | 25 | SRC_URI[sha256sum] = "1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd" |
26 | 26 | ||
27 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc | 27 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc |
28 | 28 | ||