merge of '3cf32549009f589b1377cd2d4c4d70ffb05e7a3e'

     and '9c859a543fc786163facf04e76c3bee8ee994486'

32 files changed, 178 insertions, 82 deletions

diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb
index 72c83dc56e..b2483f2bfb 100644
--- a/packages/e17/edje-editor_cvs.bb
+++ b/packages/e17/edje-editor_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Edje-Editor is just that."
 LICENSE = "MIT"
 DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 9b21c042a0..1a15746ca4 100644
--- a/packages/e17/edje-viewer_cvs.bb
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
diff --git a/packages/file/file-native_4.21.bb b/packages/file/file-native_4.21.bb
index 59535dd518..734891d18d 100644
--- a/packages/file/file-native_4.21.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,6 +1,6 @@
 require file_${PV}.bb
 inherit native
-DEPENDS = ""
+DEPENDS = "zlib-native"
 PR = "r0"
 
 SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb
new file mode 100644
index 0000000000..e0f865722e
--- /dev/null
+++ b/packages/gaim/pidgin_2.1.0.bb
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+           file://sanitize-configure.ac.patch;patch=1 \
+           file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
+	  " 
+
+PR = "r0"
diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb
index efc43ac4d3..6203b1f9d7 100644
--- a/packages/gettext/gettext-native_0.14.1.bb
+++ b/packages/gettext/gettext-native_0.14.1.bb
@@ -2,7 +2,6 @@ require gettext_${PV}.bb
 S = "${WORKDIR}/gettext-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
 inherit native
-DEPENDS = "zlib-native"
 PROVIDES = ""
 
 M4 = "\
diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_svn.bb
index 1f19550c90..1f19550c90 100644
--- a/packages/gtkhtml2/gtkhtml2_cvs.bb
+++ b/packages/gtkhtml2/gtkhtml2_svn.bb
diff --git a/packages/libowl/.mtn2git_empty b/packages/libowl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libowl/.mtn2git_empty
diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb
new file mode 100644
index 0000000000..2126e3d4d0
--- /dev/null
+++ b/packages/libowl/libowl_svn.bb
@@ -0,0 +1,48 @@
+# This recipe builds libowl and then stages the header and static lib;
+# it intentionally does not stage the shared lib and create a package.
+#
+# Libowl is currently a 'cut and paste' library; this package makes our
+# life a touch easier by not having to patch the source directly into
+# applications; instead we add -lowl to the linker cmdline. Also, when
+# we eventually make libowl into a normal shared library, this package
+# will make that transition rather simple.
+
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+LICENSE = "LGPL"
+SECTION = "libs"
+PR = "r3"
+PV = "0.0+svn${SRCDATE}"
+
+DEPENDS = "gtk+ glib-2.0"
+PACKAGES = ""
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+	# have to unstage the library first so that the tests build
+	rm -f ${STAGING_LIBDIR}/libowl*
+	rm -f ${STAGING_INCDIR}/owl*
+}
+
+do_stage() {
+	headers=`eval ls libowl/owl*.h`
+	for header in $headers; do
+		hdr_base=`eval basename $header`
+		install -m 644 $header ${STAGING_INCDIR}/$hdr_base
+	done
+	install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
+}
+
+do_install() {
+}
+
+do_package() {
+}
+
+do_package_write() {
+}
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
index c9dd8c4817..0ec2f1e448 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
 DEPENDS = "apmd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index 786c2de657..97667159b5 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
 DEPENDS = "bluez-libs"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
index 389a6f2691..578c85d2a7 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Shows the current time in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
index 8002a05fc4..4ca9543424 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
 DEPENDS = "gpsd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index 6170da7c0c..e6888ee39b 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "Shows the GSM status in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
-
-DEPENDS_append = " libgsmd"
+DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DEPENDS = "libgsmd"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
 
 inherit openmoko-panel-plugin
-
-FILES_${PN} += "${bindir}/${PN}"
-
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index cc5d6c48d3..bc5c60a381 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Main menu applet for the OpenMoko panel"
 DEPENDS += "pulseaudio startup-notification"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
index 8dc478c40b..cd7fbe1c46 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "USB applet for the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 8fe54f3348..8e547b3663 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e5a1fe74f8..90f93074ac 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index c76729e619..54fe73c6bd 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1" 
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index f818578c21..6042f67e0a 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644
index 0000000000..8e0c9ad6da
--- /dev/null
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index e44f387fc7..72bbc8517c 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "The OpenMoko address book"
 SECTION = "openmoko/pim"
 RDEPENDS = "libedata-book"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
 S = "${WORKDIR}/hito/"
 
 EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index ccbd6f8775..08ef166ee1 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 41f28ed6a1..eed51d1cd6 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,9 +1,7 @@
-DESCRIPTION = "The OpenMoko RSS Reader"
-SECTION = "openmoko/applications"
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
 DEPENDS += "libmrss check webkit"
-
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.0.1+svnr${SRCREV}"
 PR = "r0"
 
 inherit openmoko2
-
diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
index 8029e1fbc9..dc88d14ba5 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
 PR = "r1"
 
 inherit openmoko-base autotools
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index ed707a9617..a5f3108093 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index a38be614f4..94ea147b87 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
-
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko2 gtk-icon-cache 
diff --git a/packages/puzzles/oh-puzzles_svn.bb b/packages/puzzles/oh-puzzles_svn.bb
new file mode 100644
index 0000000000..67643cb281
--- /dev/null
+++ b/packages/puzzles/oh-puzzles_svn.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Portable Puzzle Collection"
+LICENSE = "MIT"
+SECTION = "x11"
+DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+PV = "0.1+svn${SRCDATE}"
+PR = "r5"
+
+inherit autotools pkgconfig
+
+SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+    mv ${D}${bindir} ${D}/usr/games
+
+    install -d ${D}/${datadir}/applications/
+
+    cd ${D}/${prefix}/games
+    for prog in *; do
+        if [ -x $prog ]; then
+            # Convert prog to Title Case
+            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+            echo "making ${D}/${datadir}/applications/$prog.desktop"
+            cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+SingleInstance=true
+Comment=Play $title.
+STOP
+        fi
+    done
+}
+
+FILES_${PN} += "${prefix}/games/*"
+FILES_${PN}-dbg += "${prefix}/games/.debug/*"
+
diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb
index 9b389c53cc..6080491cb2 100644
--- a/packages/starling/starling_0.2.bb
+++ b/packages/starling/starling_0.2.bb
@@ -3,7 +3,8 @@ SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "pulseaudio-bin \
+
+RDEPENDS = "esd \
         gst-plugin-audioconvert \
         gst-plugin-esd \
         gst-plugin-typefindfunctions \
diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb
index 25d445f6ee..67d98dbd60 100644
--- a/packages/starling/starling_svn.bb
+++ b/packages/starling/starling_svn.bb
@@ -14,8 +14,7 @@ RRECOMMENDS = "gst-plugin-mad \
         gst-plugin-ivorbis \
         gst-plugin-tcp"
 
-PV = "0.1+svn${SRCDATE}"
-
+PV = "0.2+svn${SRCDATE}"
 
 inherit gpe autotools
 
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 6ac888c55a..814f4948ba 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r50"
+PR = "r52"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -12,11 +12,10 @@ PACKAGES = "\
   task-openmoko-ui \
   task-openmoko-base \
   task-openmoko-phone \
-  task-openmoko-finger \
   task-openmoko-pim \
   task-openmoko-net \
   \
-  task-openmoko-demo \
+  task-openmoko-games \
   task-openmoko-examples \
   task-openmoko-debug \
   task-openmoko-native-sdk \
@@ -86,6 +85,7 @@ RDEPENDS_task-openmoko-base = "\
   matchbox-keyboard \
   matchbox-stroke \
   openmoko-keyboard \
+#  openmoko-panel-mainmenu \
   openmoko-panel-battery \
   openmoko-panel-bt \
   openmoko-panel-clock \
@@ -106,19 +106,12 @@ RDEPENDS_task-openmoko-phone = "\
 "
 
 #
-# task-openmoko-finger
-#
-DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications"
-RDEPENDS_task-openmoko-finger = "\
-#  openmoko-calculator \
-"
-
-#
 # task-openmoko-pim
 #
 DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
+  openmoko-calculator2 \
   openmoko-contacts2 \
   openmoko-today2 \
 #  openmoko-messages \
@@ -135,6 +128,14 @@ RDEPENDS_task-openmoko-net = "\
 "
 
 #
+# task-openmoko-games
+#
+DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+RDEPENDS_task-openmoko-games = "\
+  oh-puzzles \
+"
+
+#
 # task-openmoko-debug
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
index 2eafac668f..5946be9c3f 100644
--- a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
+++ b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
@@ -5,7 +5,6 @@ PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
 file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
 file://uboot-s3c2410-warnings-fix.patch;patch=1 \
 file://uboot-strtoul.patch;patch=1 \
 file://uboot-cramfs_but_no_jffs2.patch;patch=1 \
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index c5f5dcafa7..8a6480d54f 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -4,38 +4,37 @@ DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qm
 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"
-
-
-