12 files changed, 82 insertions, 13 deletions
diff --git a/packages/gpephone/gpe-applauncher_0.9.bb b/packages/gpephone/gpe-applauncher_0.9.bb
new file mode 100644
index 0000000000..fbc47bd091
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher_0.9.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
index 549071fdb0..5c96cfa97c 100644
--- a/packages/gpephone/machined_svn.bb
+++ b/packages/gpephone/machined_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Device abstraction and support daemon"
 SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
 PV = "0.1+svn-${SRCDATE}"
 PR = "r0"
 
@@ -13,6 +13,3 @@ inherit gpephone pkgconfig autotools
 SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
 
 S = "${WORKDIR}/${PN}"
-
-#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
-
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
index 8c86d4cfeb..5c8042c5d5 100644
--- a/packages/gpephone/ptim-manager_svn.bb
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -4,14 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
 PV = "0.1+svn-${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
 
 S = "${WORKDIR}/immanager"
 
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 3190eb3eff..8fe54f3348 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,11 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
 PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
 
 inherit openmoko2
 
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e4874b9cbe..e5a1fe74f8 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,10 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
 PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
 
 inherit openmoko2
 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index a4c4fe5d41..c76729e619 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,6 +1,11 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
 PV = "0.1.0+svn${SRCDATE}"
+PR = "r1" 
 
 inherit openmoko2
 
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index a4c4fe5d41..f818578c21 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,6 +1,14 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
 PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
 
 inherit openmoko2
 
+do_stage() {
+        autotools_stage_all
+}
+
+
+
+
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index db375357b8..006948109f 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-# RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
-# RCONFLICTS = "matchbox-common matchbox-sato"
-PR = "r19"
+RCONFLICTS = "matchbox-common openmoko-session"
+PR = "r20"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index cb191b3097..de0db79475 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -7,5 +7,5 @@ openmoko-dialer2 &
 
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
-exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
+exec matchbox-panel-2 --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
 
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index 67816017fb..a38be614f4 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,5 +1,7 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+
+PV = "0.1.0+srvn${SRCDATE}"
 
 inherit openmoko2 gtk-icon-cache 
diff --git a/packages/qemu/files/makefile.patch b/packages/qemu/files/makefile.patch
new file mode 100644
index 0000000000..75b5ac9c71
--- /dev/null
+++ b/packages/qemu/files/makefile.patch
@@ -0,0 +1,37 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile	2007-07-30 18:25:50.000000000 +0200
++++ qemu/Makefile	2007-07-30 18:26:13.000000000 +0200
+@@ -5,14 +5,14 @@
+ .PHONY: all clean distclean dvi info install install-doc tar tarbin \
+ 	speed test test2 html dvi info
+ 
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
+ ifdef CONFIG_DARWIN
+ CFLAGS+= -mdynamic-no-pic
+ endif
+ ifeq ($(ARCH),sparc)
+ CFLAGS+=-mcpu=ultrasparc
+ endif
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ TOOLS=qemu-img$(EXESUF)
+Index: qemu/Makefile.target
+===================================================================
+--- qemu.orig/Makefile.target	2007-07-30 18:27:17.000000000 +0200
++++ qemu/Makefile.target	2007-07-30 18:27:23.000000000 +0200
+@@ -17,9 +17,9 @@
+ VPATH+=:$(SRC_PATH)/linux-user
+ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
+ endif
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+ #CFLAGS+=-Werror
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ HELPER_CFLAGS=$(CFLAGS)
+ DYNGEN=../dyngen$(EXESUF)
diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb
index 23589fec9e..8cfabb3ebc 100644
--- a/packages/qemu/qemu_cvs.bb
+++ b/packages/qemu/qemu_cvs.bb
@@ -3,10 +3,11 @@ HOMEPAGE = "http://fabrice.bellard.free.fr/qemu/"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.8.2+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
            file://configure.patch;patch=1 \
+           file://makefile.patch;patch=1 \
            file://qemu-sdl-cursor.patch;patch=1 \
            file://arm_nptl.patch;patch=1 \
            file://pl110_rgb-r0.patch;patch=1 \