webkit-gtk: merge with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3639 311d38ba-8fff-0310-9ca6-ca027cbcb966

meta/packages/webkit/webkit.inc

@@ -6,7 +6,7 @@ PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
 
-inherit qmake2 pkgconfig
+inherit qmake2 
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -51,5 +51,7 @@ do_stage() {
 	cd ${S}/WebKitBuilds/Debug
 	PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro
 	oe_runmake install
+
+#sed -i -e "s:${WORKDIR}/image/::g" ${PKG_CONFIG_DIR}/WebKitGtk.pc
 }