diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-08-24 11:25:00 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-24 11:25:00 +0000 |
commit | 25db167ac64f1bfa2cb7e1a4de0cd5d3aa07ce4c (patch) | |
tree | 9dcafa5d255e982402bcab7b9efab6c302eef067 /conf | |
parent | b811e10b8353f0c4b47aac92e0a08c2d9f2e3e84 (diff) | |
parent | 5a2016ea2d5ea3c039470350b748e3f1e387ae9a (diff) |
merge of 771edb7edd8b560569a56b0e95f25a9a5685a599
and b7f12e469db67fa2a88f0754895db961c1222134
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/maemo-preferred.inc | 3 | ||||
-rw-r--r-- | conf/machine/netvista.conf | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc index 9c087f3b3c..943f244326 100644 --- a/conf/distro/maemo-preferred.inc +++ b/conf/distro/maemo-preferred.inc @@ -4,4 +4,7 @@ PREFERRED_VERSION_dbus = "0.23.1-osso5" PREFERRED_VERSION_audiofile = "0.2.6-3osso4" PREFERRED_PROVIDER_esd = "osso-esd" PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7" +PREFERRED_VERSION_glib-2.0 = "2.6.4" +PREFERRED_VERSION_pango = "1.8.1" +PREFERRED_VERSION_atk = "1.9.0" PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index fc61ba4f6a..30223a485d 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -17,8 +17,8 @@ TARGET_VENDOR = "-oe" PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" IMAGE_FSTYPE = "ext2" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace" #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace |