summaryrefslogtreecommitdiff
path: root/packages/openmoko2
diff options
context:
space:
mode:
Diffstat (limited to 'packages/openmoko2')
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb9
-rw-r--r--packages/openmoko2/openmoko-session2.bb10
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session4
-rw-r--r--packages/openmoko2/openmoko-session2/matchbox-session24
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb6
5 files changed, 19 insertions, 34 deletions
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
new file mode 100644
index 0000000000..41f28ed6a1
--- /dev/null
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "The OpenMoko RSS Reader"
+SECTION = "openmoko/applications"
+DEPENDS += "libmrss check webkit"
+
+PV = "0.0.1+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko2
+
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 006948109f..9c87a2e318 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,16 +1,14 @@
DESCRIPTION = "Custom MB session files for poky"
LICENSE = "GPL"
SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r22"
-SRC_URI = "file://etc file://matchbox-session"
+SRC_URI = "file://etc"
S = ${WORKDIR}
do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${S}/matchbox-session ${D}/${bindir}
cp -R ${S}/etc ${D}/etc
rm -fR ${D}/etc/.svn
rm -fR ${D}/etc/matchbox/.svn
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index de0db79475..6c8c62dca5 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -2,8 +2,8 @@
SHOWCURSOR="no"
-openmoko-today2 &
-openmoko-dialer2 &
+openmoko-today &
+openmoko-dialer &
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session
deleted file mode 100644
index 658ce4bcfc..0000000000
--- a/packages/openmoko2/openmoko-session2/matchbox-session
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1
-
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist.
-
-matchbox-desktop-2 &
-matchbox-panel-2 --orientation south &
-exec matchbox-window-manager $@
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index b925edce1a..ed707a9617 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,12 +1,12 @@
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svn${SRCDATE}"
PR = "r1"
inherit openmoko2
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
S = "${WORKDIR}/openmoko-standard-2"
do_install() {
@@ -19,5 +19,7 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"