diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-12-22 16:09:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-12-22 16:09:16 +0000 |
| commit | e7cf0cc43167bf9bdc87e6168e64db38d6468427 (patch) | |
| tree | 0763f885f913089c56c068ae7715d178ecc382f2 | |
| parent | e96e69a75955798de1990170f9133a96216143eb (diff) | |
| download | openembedded-core-e7cf0cc43167bf9bdc87e6168e64db38d6468427.tar.gz openembedded-core-e7cf0cc43167bf9bdc87e6168e64db38d6468427.tar.bz2 openembedded-core-e7cf0cc43167bf9bdc87e6168e64db38d6468427.tar.xz openembedded-core-e7cf0cc43167bf9bdc87e6168e64db38d6468427.zip | |
Correct osso-address book dependencies, add oprofile to poky images, switch to htk+ 2.8.9
git-svn-id: https://svn.o-hand.com/repos/poky@202 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | openembedded/conf/distro/poky.conf | 4 | ||||
| -rw-r--r-- | openembedded/packages/meta/meta-oh.bb | 2 | ||||
| -rwxr-xr-x | openembedded/packages/oh/osso-addressbook_0.0.bb | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index 9cabcf3a4..6b2e1e1ed 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -124,7 +124,7 @@ PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}" PREFERRED_VERSION_atk = "1.10.0" PREFERRED_VERSION_cairo = "1.0.0" PREFERRED_VERSION_glib-2.0 = "2.8.1" -PREFERRED_VERSION_gtk+ = "2.6.7" +PREFERRED_VERSION_gtk+ = "2.8.9" PREFERRED_VERSION_pango = "1.10.0" PREFERRED_VERSION_dbus = "0.50" @@ -157,4 +157,4 @@ PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xst ?= "0.15" - +PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}" diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index e8a9d252d..482e3135e 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb @@ -37,6 +37,7 @@ oh-task-base = "\ eds-dbus \ contacts \ osso-addressbook \ + oprofile \ dates \ leafpad \ puzzles \ @@ -64,6 +65,7 @@ RDEPENDS_oh-task-base := "${oh-task-base} \ gdk-pixbuf-loader-xpm \ gdk-pixbuf-loader-jpeg \ gtk-theme-clearlooks \ + kernel-module-oprofile \ tslib-calibrate \ tslib-tests \ pango-module-basic-x \ diff --git a/openembedded/packages/oh/osso-addressbook_0.0.bb b/openembedded/packages/oh/osso-addressbook_0.0.bb index ab49add06..6f627bd20 100755 --- a/openembedded/packages/oh/osso-addressbook_0.0.bb +++ b/openembedded/packages/oh/osso-addressbook_0.0.bb @@ -1,6 +1,7 @@ SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libgalago" -PR = "r0" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libgalago galago-daemon eds-feed" +RDEPENDS = "galago-daemon eds-feed" +PR = "r1" SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz \ file://stock_contact.png \ |