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-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.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-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch deleted file mode 100644 index e8d1d8c341..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 29 Feb 2016 18:13:39 +0200 | ||
4 | Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc | ||
5 | disabling when cross-compiling | ||
6 | |||
7 | This was not possible to override from the command line and in OpenEmbedded | ||
8 | (one of the most prominent cross-compilation frameworks) introspection does work fine, | ||
9 | through the use of qemu target emulation. | ||
10 | |||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | --- | ||
16 | Source/cmake/OptionsGTK.cmake | 6 ------ | ||
17 | 1 file changed, 6 deletions(-) | ||
18 | |||
19 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake | ||
20 | index 661b40e..404441b 100644 | ||
21 | --- a/Source/cmake/OptionsGTK.cmake | ||
22 | +++ b/Source/cmake/OptionsGTK.cmake | ||
23 | @@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS) | ||
24 | set(ENABLE_INTROSPECTION OFF) | ||
25 | endif () | ||
26 | |||
27 | -# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. | ||
28 | -if (CMAKE_CROSSCOMPILING) | ||
29 | - set(ENABLE_GTKDOC OFF) | ||
30 | - set(ENABLE_INTROSPECTION OFF) | ||
31 | -endif () | ||
32 | - | ||
33 | # Override the cached variable, gtk-doc does not really work when building on Mac. | ||
34 | if (APPLE) | ||
35 | set(ENABLE_GTKDOC OFF) | ||