Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/30 21:29:59+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2004/12/30 21:29:48+01:00 dyndns.org!reenoo
dbus: patch dbus' configure.in to avoid expansion of TMPDIR at build time, which results in a broken session.conf.

2004/12/30 20:12:36+00:00 nexus.co.uk!pb
use gpe-appmgr as default desktop on large screen (xres >= 640) devices


2004/12/30 19:46:02+00:00 nexus.co.uk!pb
add xdpyinfo


2004/12/30 19:44:53+00:00 nexus.co.uk!pb
build XTest library with XRecord support

BKrev: 41d467a6NnG2FS8mH53jeSlOKwjnQg

6 files changed, 97 insertions, 3 deletions

diff --git a/packages/xtst/xtst/no-xrecord.patch b/packages/dbus/dbus-0.22/tmpdir.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/xtst/xtst/no-xrecord.patch
+++ b/packages/dbus/dbus-0.22/tmpdir.patch
diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb
index e69de29bb2..2a177182e6 100644
--- a/packages/dbus/dbus_0.22.bb
+++ b/packages/dbus/dbus_0.22.bb
@@ -0,0 +1,70 @@
+SECTION = "base"
+PR = "r4"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0"
+
+SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://tmpdir.patch;patch=1 \
+	   file://dbus-1.init"
+
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} += "${libdir}/dbus-1.0/services"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
+		--disable-checks --disable-xml-docs --disable-doxygen-docs \
+		--with-xml=expat --without-x"
+
+headers = "dbus-glib-error-enum.h dbus-shared.h dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
+
+do_stage () {
+	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+	oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
+	for i in ${headers}; do
+		install -m 0644 dbus/$i ${STAGING_INCDIR}/dbus-1.0/dbus/$i
+	done
+
+	install -m 0644 dbus/dbus-glib.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+	install -m 0644 dbus/dbus-glib-lowlevel.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+
+	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+	install -d ${D}/usr/lib/dbus-1.0/services
+}
+
+python populate_packages_prepend () {
+	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+		bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-session-scripts/files/matchbox-session
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index 8374cdba75..4420012098 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 inherit gpe
 
@@ -7,14 +7,15 @@ DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
 
 SRC_URI += "file://zaurus.sh \
 	file://keymap.sh \
 	file://change-default-applets.patch;patch=1 \
 	file://xdefaults.patch;patch=1 \
+	file://matchbox-session \
 	file://shepherd.xmodmap file://simpad.xmodmap"
 
 do_install_append() {
@@ -27,6 +28,8 @@ do_install_append() {
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
 		echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar
 	fi
+	install -d ${D}/etc/matchbox
+	install ${WORKDIR}/matchbox-session ${D}/etc/matchbox/session
 }
 
 # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo_cvs.bb
diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb
index e69de29bb2..4fb88da3c0 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/packages/xtst/xtst_cvs.bb
@@ -0,0 +1,21 @@
+LICENSE = GPL
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 recordext xext"
+DESCRIPTION = "X Test Extension: client side library"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst"
+S = "${WORKDIR}/Xtst"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}