summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-02-17 17:09:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-18 11:37:11 +0000
commit513f93f63b2aaa7621b5418ba5953b980c973884 (patch)
tree4316c0a65514a77fce60ac3c104237180b269864 /meta/recipes-sato/webkit
parent83a7b9317276ca75e9edae201ac5a3c7d7f77739 (diff)
downloadpoky-513f93f63b2aaa7621b5418ba5953b980c973884.tar.gz
webkitgtk: remove rejected patch
Upstream has first accepted, then reverted this change, so this needs to be re-submitted, after verifying that it is still relevant. (From OE-Core rev: 389ac5f324d231525776456a64c5aaf32a6a4858) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch42
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.34.5.bb1
2 files changed, 0 insertions, 43 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
deleted file mode 100644
index a65cfc8b5a..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From b055bd199f9c40148334725a227796c0d7d14788 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 3 Feb 2020 17:06:27 -0800
4Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
5
6Fixes build failures on risv64
7
8Taken from https://trac.webkit.org/changeset/231843/webkit
9
10 Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of
11-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to
12missing atomic primitives.
13
14Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
17---
18 Source/cmake/OptionsGTK.cmake | 1 +
19 Source/cmake/OptionsJSCOnly.cmake | 1 +
20 2 files changed, 2 insertions(+)
21
22diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
23index 3cb5a495..dfba9900 100644
24--- a/Source/cmake/OptionsGTK.cmake
25+++ b/Source/cmake/OptionsGTK.cmake
26@@ -7,6 +7,7 @@ SET_PROJECT_VERSION(2 34 0)
27
28
29 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
30+set(THREADS_PREFER_PTHREAD_FLAG ON)
31
32 find_package(Cairo 1.14.0 REQUIRED)
33 find_package(Fontconfig 2.8.0 REQUIRED)
34diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
35index e892b427..73bf9e4d 100644
36--- a/Source/cmake/OptionsJSCOnly.cmake
37+++ b/Source/cmake/OptionsJSCOnly.cmake
38@@ -1,3 +1,4 @@
39+set(THREADS_PREFER_PTHREAD_FLAG ON)
40 find_package(Threads REQUIRED)
41
42 if (MSVC)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb
index e6362bedc3..41ecb8095a 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb
@@ -14,7 +14,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
14 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ 14 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
15 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ 15 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
16 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ 16 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
17 file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
18 file://reduce-memory-overheads.patch \ 17 file://reduce-memory-overheads.patch \
19 file://0001-Fix-build-without-opengl-or-es.patch \ 18 file://0001-Fix-build-without-opengl-or-es.patch \
20 file://reproducibility.patch \ 19 file://reproducibility.patch \