[gnome-continuous-yocto/gnomeostree-3.28-rocko: 864/8267] webkitgtk: do not inherit pythonnative

[Emmanuele Bassi <ebassi src gnome org>]

commit 87d4da4db42b69076384338709d3662b82c0c026
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Mon Jun 13 16:11:25 2016 +0300

    webkitgtk: do not inherit pythonnative
    
    Set the path to python 2.x explicitly instead; pythonnative
    and python3native classes cannot be used in the same recipe.
    
    (From OE-Core rev: a70f6611baaf6705b85b73feff7babc2494efcbd)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-sato/webkit/webkitgtk_2.12.3.bb |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
index 265fedb..a77b086 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
@@ -21,10 +21,12 @@ SRC_URI = "\
 SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85"
 SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307"
 
-# pythonnative must come after gobject-introspection, otherwise
-# webkit build configuration will not attempt to find Python 2.x after
-# finding (and rejecting) Python 3.x
-inherit cmake lib_package pkgconfig gobject-introspection perlnative pythonnative distro_features_check 
upstream-version-is-even
+inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check 
upstream-version-is-even
+
+# We cannot inherit pythonnative because that would conflict with inheriting python3native
+# (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary
+# so we simply set it explicitly here.
+EXTRANATIVEPATH += "python-native"
 
 # depends on libxt
 REQUIRED_DISTRO_FEATURES = "x11"