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:49:29 +0100 |
commit | bfbdd1a2069f199be9ba0909dd512469ff17b65e (patch) | |
tree | f06897fc6a99838ad53301e6a25d205532466e0d /meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | |
parent | 9ba71dc40dd782d192504b0827ca91f0fe180abe (diff) | |
download | openembedded-core-contrib-bfbdd1a2069f199be9ba0909dd512469ff17b65e.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 29 Feb 2016 18:13:39 +0200 +Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc + disabling when cross-compiling + +This was not possible to override from the command line and in OpenEmbedded +(one of the most prominent cross-compilation frameworks) introspection does work fine, +through the use of qemu target emulation. + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/OptionsGTK.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake ++++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN) + endif () + endif () + +-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. +-if (CMAKE_CROSSCOMPILING) +- set(ENABLE_GTKDOC OFF) +- set(ENABLE_INTROSPECTION OFF) +-endif () +- + # Override the cached variable, gtk-doc does not really work when building on Mac. + if (APPLE) + set(ENABLE_GTKDOC OFF) |