diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-30 21:12:28 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-30 21:12:28 +0000 |
commit | 6324a8e01afdc7b19cc8b091503d78d8c75b0167 (patch) | |
tree | 6d4f7b0bca1651f74d4640a82b7aa0f76f7a6cfc /meta/packages/webkit/webkit.inc | |
parent | 5d57d6e1b2d3fa8ad11f798803d5d6d49f9af1c0 (diff) | |
download | poky-6324a8e01afdc7b19cc8b091503d78d8c75b0167.tar.gz |
webkit-gtk: merge with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3639 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/webkit/webkit.inc')
-rw-r--r-- | meta/packages/webkit/webkit.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc index 81c2d91bf8..e7820409a2 100644 --- a/meta/packages/webkit/webkit.inc +++ b/meta/packages/webkit/webkit.inc | |||
@@ -6,7 +6,7 @@ PACKAGES =+ "${PN}launcher-dbg ${PN}launcher" | |||
6 | # Yes, this is wrong... | 6 | # Yes, this is wrong... |
7 | PV = "0.1+svnr${SRCREV}" | 7 | PV = "0.1+svnr${SRCREV}" |
8 | 8 | ||
9 | inherit qmake2 pkgconfig | 9 | inherit qmake2 |
10 | 10 | ||
11 | SRC_URI = "\ | 11 | SRC_URI = "\ |
12 | svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ | 12 | svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ |
@@ -51,5 +51,7 @@ do_stage() { | |||
51 | cd ${S}/WebKitBuilds/Debug | 51 | cd ${S}/WebKitBuilds/Debug |
52 | PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro | 52 | PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro |
53 | oe_runmake install | 53 | oe_runmake install |
54 | |||
55 | #sed -i -e "s:${WORKDIR}/image/::g" ${PKG_CONFIG_DIR}/WebKitGtk.pc | ||
54 | } | 56 | } |
55 | 57 | ||