From 09d5e0f91495fcd66847b6db030683e30c15c124 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 5 Apr 2007 14:31:09 +0000
Subject: gpe-session-scripts-phone: Update session file to set up environment
 for PTIM.

---
 packages/gpephone/gpe-session-scripts-phone/phonesession | 8 ++++++++
 packages/gpephone/gpe-session-scripts-phone_0.67.bb      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 689b3c01ed..38c1f90db0 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -30,6 +30,14 @@ export	TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 # For Calendar
 export	CAL_RES_PATH=$APP_PATH/share/res
 
+# For GTK input engine
+export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps
+export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig 
+export PTIM_HELPER_PATH=$PTIM_PATH/helper
+export PTIM_ENGINE_PATH=$PTIM_PATH/engine
+export GTK_IM_MODULE=ptim
+
 # Start GPE Phone Edition apps through matchbox session
 gpe-applauncher&
 sleep 2
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 5312d63249..5af3ff683a 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://phonesession \
 	   file://disable-composite.xsettings"
 
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
-- 
cgit v1.2.3


From b69d4cc70e67e973e51d7f2234ff181de90f399f Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 5 Apr 2007 14:49:27 +0000
Subject: task-sdk-sbox: Add some useful things.

---
 packages/tasks/task-sdk-sbox.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
index 855d720143..67d5ed47f4 100644
--- a/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -1,17 +1,22 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps"
-PR = "r2"
+PR = "r4"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 RDEPENDS := "\
     glib-2.0-utils \
     gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-jpg \
+    gdk-pixbuf-loader-jpeg \
     gdk-pixbuf-loader-gif \
     gdk-pixbuf-loader-xpm \
     intltool \
+    intltool-dev \
     strace \
     gdb \
     sbrsh \
     fakeroot \
+    matchbox-wm \
+    dbus \
+    joe \
+    ipkg \
     "
\ No newline at end of file
-- 
cgit v1.2.3


From 530a3e9647aba8369e01c5e90b8f9672febdd2cd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 5 Apr 2007 19:08:07 +0000
Subject: hal: install /var/cache/hald

---
 packages/hal/files/99_hal | 1 +
 packages/hal/hal_0.5.9.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal
index f3d477231e..f983db9ee5 100644
--- a/packages/hal/files/99_hal
+++ b/packages/hal/files/99_hal
@@ -1 +1,2 @@
 d root root 0700 /var/run/hald none
+d root root 0700 /var/cache/hald none
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index e021f03045..bb9dc82b52 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -8,7 +8,7 @@ RDEPENDS += "udev hal-info"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
         file://99_hal"
-- 
cgit v1.2.3


From 6f3c79ab520a30cbfda05b40f868fcbb35afc67e Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 5 Apr 2007 19:58:34 +0000
Subject: slugos: Pin linux-libc-headers to 2.6.18, due to annoying 2.6.20
 breakage.

---
 conf/distro/include/slugos.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index d64cb2c917..df16ad557f 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -143,3 +143,5 @@ IGNORE_STRIP_ERRORS = ""
 # needs, nail down a specific, known-working version of madwifi-ng.
 # Remove this once the madwifi-ng stuff seems to stabilize once again.
 PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
+
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
\ No newline at end of file
-- 
cgit v1.2.3