From: Holger Freyther <zecke@selfish.org>
Date: Fri, 4 Jun 2004 17:36:28 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~18869
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=493b10222886a1d47ea2a055f259f56f6edb818c;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/06/04 19:34:06+02:00 (none)!ich
Changes to make oemake gpe-image work on a system that doesn't have any
g*-dev packages installed.

-GCONF2.6.1 tried to call /usr/bin/orbit-idl-2 from both compile and install
-Matchbox 0.8 + 0.8.1 get patched to use gconf and 0.8.2 does
 have it by default. So make them depend on gconf

2004/06/04 16:26:26+02:00 (none)!ich
Local merge

2004/06/04 16:23:07+02:00 (none)!ich

BKrev: 40c0b31cCucX126IZpg4h-XKtiSjVg
---

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 \