aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-09-16 12:08:18 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-09-16 12:08:18 +0000
commit7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c (patch)
treeee65d252fa7b9aceb73e899edf8d35449bf5ed23
parent1cf4e52868de5127d1673ed057368daaff1095ef (diff)
parent896bd1e5e0478426148ab1aef0c13017f3df8fbf (diff)
downloadopenembedded-7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c.tar.gz
openembedded-7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c.tar.bz2
openembedded-7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c.zip
merge of '023be36fca00265ea31a1a05b16e2ff2a3480415'
and '2240acf86047820a29307f8c7417de1943260355'
-rw-r--r--packages/openmoko2/openmoko-session2.bb4
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
-rw-r--r--packages/tasks/task-openmoko-feed.bb4
-rw-r--r--packages/tasks/task-openmoko.bb25
4 files changed, 19 insertions, 16 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index de2d7cdff6..235ca6ad97 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Custom MB session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r31"
+PR = "r32"
SRC_URI = "file://etc"
S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 4f2f8ae110..558f55ee87 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,8 +1,6 @@
#!/bin/sh
SHOWCURSOR="no"
-export GTK_MODULES="libgtkstylus.so"
-
openmoko-today &
openmoko-dialer &
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index bc4a4ff967..f11f322e39 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -24,9 +24,13 @@ RDEPENDS_task-openmoko-feed = "\
openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
python python-pygtk python-pyserial \
ruby \
+ libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
synergy \
tzdata \
+ timezones \
tor \
vnc \
+ wxwidgets \
+ x11vnc \
"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index dd3b13e206..3b48b674c7 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 = "r64"
+PR = "r65"
inherit task
@@ -52,25 +52,26 @@ RDEPENDS_task-openmoko-ui = "\
pango-module-basic-x \
pango-module-basic-fc \
gtk+ \
- libgtkstylus \
- libgtkinput \
matchbox-common \
matchbox-wm \
xserver-kdrive-fbdev \
xserver-kdrive-common \
xserver-nodm-init \
-# x11-c-locale \
ttf-bitstream-vera \
xauth \
xhost \
xset \
xrandr \
+ \
settings-daemon \
+ notification-daemon \
+ neod \
+ libnotify \
\
openmoko-session2 \
openmoko-sound-system2 \
openmoko-sound-theme-standard2 \
- neod \
+ \
gpe-scap \
"
@@ -92,24 +93,24 @@ PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
#
# task-openmoko-base
#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
RDEPENDS_task-openmoko-base = "\
matchbox-panel-2 \
matchbox-panel-2-applets \
- matchbox-applet-inputmanager \
-# openmoko-appmanager \
matchbox-keyboard-inputmethod \
matchbox-keyboard-im \
matchbox-keyboard-applet \
matchbox-stroke \
openmoko-terminal2 \
- openmoko-keyboard \
-# openmoko-panel-mainmenu \
+# openmoko-keyboard \
openmoko-panel-battery \
openmoko-panel-bt \
openmoko-panel-clock \
openmoko-panel-usb \
${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+ \
+ openmoko-today2 \
+# openmoko-appmanager \
"
#
@@ -127,7 +128,7 @@ RDEPENDS_task-openmoko-phone = "\
#
# task-openmoko-pim
#
-DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
RDEPENDS_task-openmoko-pim = "\
eds-dbus \
openmoko-calculator2 \
@@ -135,7 +136,7 @@ RDEPENDS_task-openmoko-pim = "\
openmoko-dates2 \
openmoko-feedreader2 \
openmoko-tasks2 \
- openmoko-today2 \
+ openmoko-mediaplayer2 \
# openmoko-messages \
"