diff options
| -rw-r--r-- | conf/distro/maemo-preferred.inc | 3 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 4 | ||||
| -rw-r--r-- | packages/gpe-bluetooth/gpe-bluetooth_0.42.bb | 15 | ||||
| -rw-r--r-- | packages/gpe-conf/gpe-conf_0.1.25.bb | 26 | ||||
| -rw-r--r-- | packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb | 5 | ||||
| -rw-r--r-- | packages/xdpyinfo/xdpyinfo_cvs.bb | 3 |
6 files changed, 51 insertions, 5 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 diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.42.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.42.bb new file mode 100644 index 0000000000..6a4e6dc907 --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.42.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +inherit gpe autotools + +DESCRIPTION = "GPE bluetooth support" +DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +RDEPENDS = "bluez-utils-dbus blueprobe" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +FILES_${PN} += '${datadir}/bluez-pin' + diff --git a/packages/gpe-conf/gpe-conf_0.1.25.bb b/packages/gpe-conf/gpe-conf_0.1.25.bb new file mode 100644 index 0000000000..533c0a0436 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.1.25.bb @@ -0,0 +1,26 @@ +PACKAGES = "gpe-conf gpe-conf-panel" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" + +inherit gpe +PR="r0" + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" +RDEPENDS_gpe-conf-panel = "gpe-conf" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +do_install () { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program +} + + diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index eb461a860c..96b057cdf3 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,12 +1,13 @@ DESCRIPTION = "The Gnome Virtual File System - OSSO Version" LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r2" +PR = "r3" +PROVIDES = "virtual/gnome-vfs" RPROVIDES = "gnome-vfs" inherit gnome pkgconfig -DEPENDS = "libxml2 gconf-osso dbus bzip2 gnome-mime-data zlib samba osso-gwconnect" +DEPENDS = "libxml2 gconf-osso dbus_0.23.1-osso5 bzip2 gnome-mime-data zlib samba osso-gwconnect" RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \ diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb index 41d3734c9b..6a72d61a77 100644 --- a/packages/xdpyinfo/xdpyinfo_cvs.bb +++ b/packages/xdpyinfo/xdpyinfo_cvs.bb @@ -1,9 +1,10 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" -DEPENDS = "x11 xext" +DEPENDS = "x11 xext xtst" DESCRIPTION = "X display information utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" +PR = "r1" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xdpyinfo" S = "${WORKDIR}/xdpyinfo" |