Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1775 - trunk/src/target/OM-2007/openmoko-libs
([EMAIL PROTECTED])
2. r1776 - in trunk/oe: conf/distro/include
packages/openmoko-apps packages/openmoko-apps/openmoko-terminal
packages/tasks ([EMAIL PROTECTED])
3. r1777 - in trunk/oe/packages/openmoko-apps: .
openmoko-terminal ([EMAIL PROTECTED])
4. r1778 - trunk/src/target/OM-2007/devel/qmake
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-04-15 19:35:53 +0200 (Sun, 15 Apr 2007)
New Revision: 1775
Modified:
trunk/src/target/OM-2007/openmoko-libs/TODO
Log:
openmoko-libs: refine TODO
Modified: trunk/src/target/OM-2007/openmoko-libs/TODO
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/TODO 2007-04-15 17:22:45 UTC (rev
1774)
+++ trunk/src/target/OM-2007/openmoko-libs/TODO 2007-04-15 17:35:53 UTC (rev
1775)
@@ -1,8 +1,10 @@
(Ordered by Priority)
+- split up into individually buildable libraries (esp. regarding pkgconfig
support)
- MokoPopupMenu:
-- moko_popup_menu_add_item( label, callback, userdata, notification );
-- after item has been selected, make notification popup via OSD
+ -- distinguish finger and stylus modes
- Add MokoBanner (as OSD)
- Start Footer Application and implement Status Bar Interface
- Add Status Bar Interface to MokoApplication
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-15 20:25:35 +0200 (Sun, 15 Apr 2007)
New Revision: 1776
Added:
trunk/oe/packages/openmoko-apps/openmoko-terminal/
trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe: add openmoko-terminal (just glue .desktop + .png for gtkterm2)
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-04-15 17:35:53 UTC (rev 1775)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-04-15 18:25:35 UTC (rev 1776)
@@ -60,6 +60,7 @@
SRCDATE_openmoko-phone = "now"
SRCDATE_openmoko-mainmenu = "now"
SRCDATE_openmoko-taskmanager = "now"
+SRCDATE_openmoko-terminal = "now"
#
# Multimedia
Added:
trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
2007-04-15 17:35:53 UTC (rev 1775)
+++ trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
2007-04-15 18:25:35 UTC (rev 1776)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Terminal
+Comment=Command Line Interface Terminal
+Exec=gtkterm2
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
Added: trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
===================================================================
(Binary files differ)
Property changes on:
trunk/oe/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb 2007-04-15
17:35:53 UTC (rev 1775)
+++ trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb 2007-04-15
18:25:35 UTC (rev 1776)
@@ -0,0 +1,19 @@
+DESCRIPTION = "The OpenMoko Application Manager"
+SECTION = "openmoko/applications"
+DEPENDS += "ipkg"
+RDEPENDS += "gtkterm2"
+PV = "1.0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko
+
+SRC_URI = "file://openmoko-terminal.png \
+ file://openmoko-terminal.desktop"
+
+do_install() {
+ install -d ${D}/${datadir}/pixmaps
+ install -d ${D}/${datadir}/applications
+ install -m 0644 ${WORKDIR}/openmoko-terminal.png
${D}/${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/openmoko-terminal.desktop
${D}${datadir}/applications/
+}
+
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-04-15 17:35:53 UTC (rev
1775)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-04-15 18:25:35 UTC (rev
1776)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r37"
+PR = "r38"
PACKAGES = "\
task-openmoko-linux \
@@ -87,7 +87,7 @@
#
DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and
Footer"
RDEPENDS_task-openmoko-base = "\
- gtkterm2 \
+ openmoko-terminal \
openmoko-mainmenu \
matchbox-panel-2 \
matchbox-panel-2-applets \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-15 23:45:09 +0200 (Sun, 15 Apr 2007)
New Revision: 1777
Added:
trunk/oe/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
Modified:
trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb
Log:
oe/openmoko-terminal: add proper resource file on install, fix DESCRIPTION and
DEPENDS
Added: trunk/oe/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
2007-04-15 18:25:35 UTC (rev 1776)
+++ trunk/oe/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
2007-04-15 21:45:09 UTC (rev 1777)
@@ -0,0 +1,85 @@
+##
+# 1=RIGHT, 2=TOP, 3=BOTTOM, 4=LEFT
+##
+notebookPanel=3
+
+##
+# 0=HIDDEN, 1=LEFT, 2=RIGHT
+##
+terminalScrollbar=2
+
+##
+# 0=NO SCROLLBAR
+##
+maxScrollbackBuffer=999
+
+##
+# 0=FALSE, 1=TRUE
+##
+quitPRGonExitLastTerminal=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+showTabsByOneTerminal=0
+
+##
+#A Font name: use gnome-font-properties to look at available fonts
+##
+terminalFont=BitStream Vera Sans Mono 11
+
+##
+# Separator for marking with mouse
+##
+worldClass=-A-Za-z0-9/_:.,?+%=
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnKeyStroke=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnOutput=0
+
+##
+# 0=FALSE, 1=TRUE
+##
+blink=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+beep=1
+
+##
+# x y Default Terminal Size in pix
+##
+terminalSize=80 25
+
+##
+# NEW COLOR Definition
+##
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0xcccc
0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc
0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0xcccc
0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
+##
+# COLOR Definition
+##
+
+##
+# First section
+##
+[section]
+match=
+worldClass=-A-Za-z0-9/_:.,?+%=
+scrollOnKeyStroke=1
+scrollOnOutput=0
+beep=1
+blink=1
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0x0000
0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc
0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0x0000
0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
Modified: trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb 2007-04-15
18:25:35 UTC (rev 1776)
+++ trunk/oe/packages/openmoko-apps/openmoko-terminal_svn.bb 2007-04-15
21:45:09 UTC (rev 1777)
@@ -1,19 +1,34 @@
-DESCRIPTION = "The OpenMoko Application Manager"
+DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
-DEPENDS += "ipkg"
RDEPENDS += "gtkterm2"
PV = "1.0.0+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit openmoko
SRC_URI = "file://openmoko-terminal.png \
- file://openmoko-terminal.desktop"
+ file://openmoko-terminal.desktop \
+ file://gtkterm2rc"
do_install() {
- install -d ${D}/${datadir}/pixmaps
- install -d ${D}/${datadir}/applications
- install -m 0644 ${WORKDIR}/openmoko-terminal.png
${D}/${datadir}/pixmaps/
+ install -d ${D}${sysconfdir}/skel
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/openmoko-terminal.png
${D}${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/openmoko-terminal.desktop
${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/gtkterm2rc
${D}${sysconfdir}/skel/.gtkterm2rc
}
+pkg_postinst_openmoko-terminal() {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1 # don't run at image generation time
+else
+ if [ -e "$HOME/.gtkterm2rc" ]; then
+ echo "not overriding $HOME/.gtkterm2rc"
+ else
+ echo "installing $HOME/.gtkterm2rc from /etc/skel"
+ cp -f ${sysconfdir}/skel/.gtkterm2rc $HOME/
+ fi
+fi
+}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-16 00:02:23 +0200 (Mon, 16 Apr 2007)
New Revision: 1778
Modified:
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
Log:
devel/qmake: include glib-genmarshal as additional compiler
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-15
21:45:09 UTC (rev 1777)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-15
22:02:23 UTC (rev 1778)
@@ -19,6 +19,21 @@
MOC_DIR=.moc/$$PLATFORM
OBJECTS_DIR=.obj/$$PLATFORM
+#
+# integrate glib-genmarshal as additional compiler
+#
+QMAKE_GENMARSHAL_CC = glib-genmarshal
+glib-genmarshal.commands = $${QMAKE_GENMARSHAL_CC}
--prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header --body
>${QMAKE_FILE_OUT}
+glib-genmarshal.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
+glib-genmarshal.input = GENMARSHALS
+glib-genmarshal.CONFIG = no_link
+glib-genmarshal.variable_out = PRE_TARGETDEPS
+glib-genmarshal.name = GENMARSHALS
+QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal
+
+#
+# integrate dbus-binding-tool as additional compiler
+#
QMAKE_DBUS_CC = dbus-binding-tool
dbus-binding-tool.commands = $${QMAKE_DBUS_CC} --mode=glib-server
${QMAKE_FILE_IN} >${QMAKE_FILE_OUT}
dbus-binding-tool.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
