diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-05 22:56:04 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-05 22:56:04 +0000 |
| commit | dbd10f28acdcd147b3ad6f6b9cbc7f688ead8b47 (patch) | |
| tree | 4135fe29a6f8999d97c2becaa7907514febeb23f | |
| parent | bde12db3a8e623eee6c5ababb33e4c18d7d95d5f (diff) | |
| parent | 6f3c79ab520a30cbfda05b40f868fcbb35afc67e (diff) | |
merge of '7d50f2e0aeefca053ef8407566020fd864a8b12c'
and '9f65c4ed11c11a2fcee190fbb54330e3e5ddec37'
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
| -rwxr-xr-x | packages/gpephone/gpe-session-scripts-phone/phonesession | 8 | ||||
| -rw-r--r-- | packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 | ||||
| -rw-r--r-- | packages/hal/files/99_hal | 1 | ||||
| -rw-r--r-- | packages/hal/hal_0.5.9.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-sdk-sbox.bb | 9 |
6 files changed, 20 insertions, 4 deletions
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 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}" 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" 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 |