summaryrefslogtreecommitdiffstats
path: root/meta-openmoko/packages/openmoko2
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-28 11:08:29 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-28 11:08:29 +0000
commit114a799b814ff4a5fe58a20caf7665a9d9b94b02 (patch)
treeb9250ce6075f151abfe23d9e12e7999b05f0bd71 /meta-openmoko/packages/openmoko2
parent39d90fb3c00a8c99bd499a42361dceef3fa4ee08 (diff)
downloadpoky-114a799b814ff4a5fe58a20caf7665a9d9b94b02.tar.gz
openmoko2: sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2576 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages/openmoko2')
-rw-r--r--meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb12
-rw-r--r--meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb14
-rw-r--r--meta-openmoko/packages/openmoko2/libmokoui2_svn.bb17
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb13
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb12
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-session2.bb17
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb12
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb12
8 files changed, 68 insertions, 41 deletions
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
index e4baa81054..2551519348 100644
--- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,5 +1,11 @@
1require openmoko-libs.inc 1SECTION = "openmoko/libs"
2
3DEPENDS = "libgsmd glib-2.0" 2DEPENDS = "libgsmd glib-2.0"
3PV = "0.1.0+svn${SVNREV}"
4PR = "r1" 4PR = "r1"
5REAL_PN = "libmokogsmd2" 5
6inherit openmoko2
7
8do_stage() {
9 autotools_stage_all
10}
11
diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
index 6730426a3d..6e5383af83 100644
--- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,5 +1,11 @@
1require openmoko-libs.inc 1SECTION = "openmoko/libs"
2
3DEPENDS = "eds-dbus" 2DEPENDS = "eds-dbus"
4PR = "r1" 3PV = "0.1.0+svn${SVNREV}"
5REAL_PN = "libmokojournal2" 4PR = "r2"
5
6inherit openmoko2 lib_package
7
8do_stage() {
9 autotools_stage_all
10}
11
diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
index b845caa331..86372ae274 100644
--- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
@@ -1,5 +1,14 @@
1require openmoko-libs.inc 1SECTION = "openmoko/libs"
2
3DEPENDS = "gtk+" 2DEPENDS = "gtk+"
4PV = "0.0.5+svn${SRCDATE}" 3PV = "0.1.0+svn${SVNREV}"
5REAL_PN = "libmokoui2" 4PR = "r1"
5
6inherit openmoko2
7
8do_stage() {
9 autotools_stage_all
10}
11
12
13
14
diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
index bd872dd79d..c63738a912 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,12 +1,13 @@
1require openmoko.inc 1DESCRIPTION = "The OpenMoko Address Book"
2 2SECTION = "openmoko/pim"
3DESCRIPTION = "The OpenMoko address book" 3DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
4RDEPENDS = "libedata-book" 4RDEPENDS = "libedata-book"
5PV = "0.1+svn${SRCDATE}" 5PV = "0.1.0+svn${SVNREV}"
6PR = "r2" 6PR = "r4"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http" 8inherit openmoko2
9 9
10SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
10S = "${WORKDIR}/hito/" 11S = "${WORKDIR}/hito/"
11 12
12EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko" 13EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
index d5011da840..655272f293 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,10 +1,10 @@
1require openmoko.inc
2
3DESCRIPTION = "The OpenMoko Dialer" 1DESCRIPTION = "The OpenMoko Dialer"
4DEPENDS += "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer" 2SECTION = "openmoko/pim"
5RDEPENDS = "gst-meta-audio" 3DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
6REAL_PN = "openmoko-dialer2" 4PV = "0.1.0+svn${SVNREV}"
7PR = "r2" 5PR = "r4"
6
7inherit openmoko2
8 8
9EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" 9EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
10 10
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
index 38a560461d..046f59b3d9 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
@@ -1,16 +1,15 @@
1DESCRIPTION = "Custom MB session files for poky" 1DESCRIPTION = "Custom MB session files for OpenMoko"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato" 4RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
5RCONFLICTS = "matchbox-common matchbox-sato" 5RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
6PR = "r19" 6RCONFLICTS = "openmoko-session"
7PR = "r29"
7 8
8SRC_URI = "file://etc file://matchbox-session" 9SRC_URI = "file://etc"
9S = ${WORKDIR} 10S = ${WORKDIR}
10 11
11do_install() { 12do_install() {
12 install -d ${D}/${bindir}
13 install -m 0755 ${S}/matchbox-session ${D}/${bindir}
14 cp -R ${S}/etc ${D}/etc 13 cp -R ${S}/etc ${D}/etc
15 rm -fR ${D}/etc/.svn 14 rm -fR ${D}/etc/.svn
16 rm -fR ${D}/etc/matchbox/.svn 15 rm -fR ${D}/etc/matchbox/.svn
@@ -27,4 +26,8 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
27gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard 26gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
28gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" 27gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
29gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 28gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
29gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
30
30} 31}
32
33PACKAGE_ARCH = "all"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
index 43a1fd41d0..bbeba4420f 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,13 +1,12 @@
1require openmoko.inc
2
3DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" 1DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
4SECTION = "openmoko/base" 2SECTION = "openmoko/base"
5RCONFLICTS = "openmoko-theme-standard" 3RCONFLICTS = "openmoko-theme-standard"
6PACKAGE_ARCH = "all" 4PV = "0.1.0+svnr${SRCDATE}"
7PR = "r1" 5PR = "r2"
8 6
9SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http" 7inherit openmoko2
10 8
9SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
11S = "${WORKDIR}/openmoko-standard-2" 10S = "${WORKDIR}/openmoko-standard-2"
12 11
13do_install() { 12do_install() {
@@ -20,4 +19,7 @@ do_install() {
20 echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc 19 echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
21} 20}
22 21
22CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
23
24PACKAGE_ARCH = "all"
23FILES_${PN} = "${datadir} ${sysconfdir}" 25FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
index fc6aba99a2..bfc5fc201d 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,8 +1,8 @@
1require openmoko.inc 1DESCRIPTION = "The OpenMoko Application Launcher"
2
3DESCRIPTION = "OpenMoko Today application"
4SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
5DEPENDS += "startup-notification dbus-glib libice libsm libmokoui2" 3DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
6REAL_PN = "openmoko-today2" 4RDEPENDS = "libedata-cal openmoko-today2-folders"
5PV = "0.1.0+svn${SVNREV}"
6PR = "r1"
7 7
8inherit gtk-icon-cache 8inherit openmoko2 gtk-icon-cache