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

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

2005/02/28 13:18:40+00:00 nexus.co.uk!pb
bump PR on task-bootstrap

2005/02/28 13:15:39+00:00 nexus.co.uk!pb
fix up rxvt-unicode

2005/02/28 13:09:35+00:00 nexus.co.uk!pb
add missing dependency on libgcrypt

2005/02/28 12:43:15+00:00 nexus.co.uk!pb
update glib-2.0 to 2.6.3


BKrev: 4224baaeEmF4SHogRukZlbI5BN6q9A

4 files changed, 55 insertions, 2 deletions

diff --git a/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.6.3.bb
diff --git a/packages/gtk+/gtk+_2.6.2.bb b/packages/gtk+/gtk+_2.6.2.bb
index dbfcb93c30..1a842d160f 100644
--- a/packages/gtk+/gtk+_2.6.2.bb
+++ b/packages/gtk+/gtk+_2.6.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc"
+DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index ccd57b8661..f7cade5495 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r21"
+PR = "r22"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
index e69de29bb2..fc39d1109d 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.2.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
@@ -0,0 +1,53 @@
+SECTION = "x11/utils"
+DEPENDS = "x11 xt libxft"
+DESCRIPTION = "rxvt-unicode is a clone of the well known \
+terminal emulator rxvt, modified to store text in Unicode \
+(either UCS-2 or UCS-4) and to use locale-correct input and \
+output. It also supports mixing multiple fonts at the \
+same time, including Xft fonts."
+LICENSE = "GPL"
+SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
+	   file://signedchar.patch;patch=1"
+
+inherit autotools update-alternatives
+
+PROVIDES = "virtual/x-terminal-emulator"
+ALTERNATIVE_NAME = "x-terminal-emulator"
+ALTERNATIVE_PATH = "${bindir}/rxvt"
+
+CFLAGS_append = " -fpermissive"
+
+EXTRA_OECONF = "--enable-menubar --enable-xim \
+		--enable-utmp --enable-wtmp --enable-lastlog \
+		--disable-strings --with-term=rxvt --enable-keepscrolling \
+		--enable-xft --with-name=rxvt --enable-frills \
+		--enable-swapscreen --enable-transparency \
+		--with-codesets=eu \
+		--enable-cursor-blink --enable-pointer-blank \
+		--enable-text-blink --enable-plain-scroll \
+		--enable-combining --enable-shared \
+		--enable-xgetdefault \
+		--with-x=${STAGING_LIBDIR}/.."
+EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
+		'XLIB=-L${STAGING_LIBDIR} -lX11'"
+
+do_configure () {
+	mv autoconf/configure.in . || true
+	rm autoconf/libtool.m4
+	libtoolize --force
+	autotools_do_configure
+	echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
+	echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
+	echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
+	echo '#define HAVE_XLOCALE 1' >> config.h
+}
+
+do_compile () {
+	if test -e ${S}/${HOST_SYS}-libtool; then
+		LIBTOOL=${S}/${HOST_SYS}-libtool
+	else
+		LIBTOOL=${S}/libtool
+	fi
+	# docs need "yodl" and I have no idea what that is
+	oe_runmake -C src "LIBTOOL=$LIBTOOL"
+}