diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | gnome/gconf_2.6.1.oe | 7 | ||||
| -rw-r--r-- | matchbox-wm/matchbox-wm_0.8.1.oe | 2 | ||||
| -rw-r--r-- | matchbox-wm/matchbox-wm_0.8.2.oe | 2 | ||||
| -rw-r--r-- | matchbox-wm/matchbox-wm_0.8.oe | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 93bc93f851..fd603c6b43 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -41,3 +41,4 @@ timh@host10.kano.org.uk wind@spiritship.(none) xf005570@cn014xf005570l1.(none) xf005570@cn014xf005570w1. +zecke@handhelds.org diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe index a893ae896a..6c13efc9aa 100644 --- a/gnome/gconf_2.6.1.oe +++ b/gnome/gconf_2.6.1.oe @@ -3,6 +3,7 @@ DESCRIPTION = "GNOME configuration database system" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ file://backends.patch;patch=1" DEPENDS = "orbit2 glib-2.0 gettext-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" FILES_${PN} += " ${libdir}/GConf/*" @@ -15,7 +16,7 @@ inherit autotools pkgconfig HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" do_compile() { - oe_runmake ORBIT_IDL="`which orbit-idl-2`" + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } do_stage() { @@ -24,3 +25,7 @@ do_stage() { ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 } + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe index 9bf3cd3ca3..3d3909e1dd 100644 --- a/matchbox-wm/matchbox-wm_0.8.1.oe +++ b/matchbox-wm/matchbox-wm_0.8.1.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat" +DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat gconf" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://m4.patch;patch=1" diff --git a/matchbox-wm/matchbox-wm_0.8.2.oe b/matchbox-wm/matchbox-wm_0.8.2.oe index ce688ffdee..a8e71adcce 100644 --- a/matchbox-wm/matchbox-wm_0.8.2.oe +++ b/matchbox-wm/matchbox-wm_0.8.2.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat" +DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat gconf" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2" S = "${WORKDIR}/matchbox-window-manager-${PV}" diff --git a/matchbox-wm/matchbox-wm_0.8.oe b/matchbox-wm/matchbox-wm_0.8.oe index 7bdb3a3420..2d8cd6fb22 100644 --- a/matchbox-wm/matchbox-wm_0.8.oe +++ b/matchbox-wm/matchbox-wm_0.8.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender" +DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender gconf" RDEPENDS = "libmatchbox" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ |