diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-03-24 09:52:55 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-03-24 09:52:55 +0000 |
commit | fc11f4a9df443abfe39313ed1e58bfefe06f54a0 (patch) | |
tree | ac96f9e0189a1fea918b89361f065ed143803501 | |
parent | 683486ef28c1a8413b027c36daaff85005653d9f (diff) | |
parent | 95e68956c2863f790de0bdef7c6373403912b9b5 (diff) |
merge of '1889b23e60bd0651ca48e0e38b914ffedce70bd2'
and '5df32e0915ba204f944bb2bfc083f0cb605f466f'
-rw-r--r-- | conf/distro/include/openmoko.inc | 1 | ||||
-rw-r--r-- | packages/openmoko-pim/openmoko-today_svn.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 4c728e1922..c41f993884 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -90,6 +90,7 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" # we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index 8eb098bebb..74e79b85f1 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" -DEPENDS = "openmoko-libs" +DEPENDS = "openmoko-libs eds-dbus" PV = "0.1+svn${SRCDATE}" inherit autotools pkgconfig gtk-icon-cache openmoko |