[oe-commits] org.oe.dev webkit: clean up (guys, please don't mix TABs and SPACEs) and make it build

[mickeyl commit]

webkit: clean up (guys, please don't mix TABs and SPACEs) and make it build

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7
Files:
1
packages/webkit/webkit_svn.bb
Diffs:

#
# mt diff -refe503d8b107209e78a983e4598eef973fe8b5b8 -r2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7
#
# 
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948]
#    to [cb5b674496bc18948802b1c9b8f634d574e64268]
# 
============================================================
--- packages/webkit/webkit_svn.bb	2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948
+++ packages/webkit/webkit_svn.bb	cb5b674496bc18948802b1c9b8f634d574e64268
@@ -1,41 +1,40 @@ PR = "r1"
 DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
 PR = "r1"
 
-inherit qmake pkgconfig
+inherit qmake qt4x11 pkgconfig
 
 SRC_URI = "\
-           svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
-           svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
-           svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \
-           svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
-           svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
-#           svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
-           svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
-           file://Makefile \
-	   file://Makefile.shared \
-	   file://WebKit.pri \
-	   file://WebKit.pro \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+#  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+  file://Makefile \
+  file://Makefile.shared \
+  file://WebKit.pri \
+  file://WebKit.pro \
 "
-
 S = "${WORKDIR}/"
 
-
 do_configure_append() {
-        qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
+	qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+      WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
 }
 
 do_compile_prepend() {
-         mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-         cd ${S}/JavaScriptCore/pcre 
-	 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
-	 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-         cd ${S}/WebKitBuilds/Debug
+	mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+	cd ${S}/JavaScriptCore/pcre 
+	${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+	cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+	cd ${S}/WebKitBuilds/Debug
 }
 
 do_install() {
@@ -44,24 +43,22 @@ do_install() {
 	install -d ${D}${libdir}/pkgconfig
 
 	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
-        cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
-        oe_runmake install
+	cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+      WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+	oe_runmake install
 }
 
-
 do_stage() {
-        install -d ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}
-        cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
-        oe_runmake install
+	install -d ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}
+	cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+      WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+	oe_runmake install
 }
 
 PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
 
 FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
 FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"
-
-
-