diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.tar.gz |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.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 | 32 |
1 files changed, 32 insertions, 0 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 new file mode 100644 index 0000000000..93a69c0292 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 48648570e449cf7f84a26dc03c1e3f620fa69757 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 | Source/cmake/OptionsGTK.cmake | 6 ------ | ||
14 | 1 file changed, 6 deletions(-) | ||
15 | |||
16 | Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake | ||
17 | =================================================================== | ||
18 | --- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake | ||
19 | +++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake | ||
20 | @@ -424,12 +424,6 @@ if (USE_LIBHYPHEN) | ||
21 | endif () | ||
22 | endif () | ||
23 | |||
24 | -# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. | ||
25 | -if (CMAKE_CROSSCOMPILING) | ||
26 | - set(ENABLE_GTKDOC OFF) | ||
27 | - set(ENABLE_INTROSPECTION OFF) | ||
28 | -endif () | ||
29 | - | ||
30 | # Override the cached variable, gtk-doc does not really work when building on Mac. | ||
31 | if (APPLE) | ||
32 | set(ENABLE_GTKDOC OFF) | ||