merge of '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'

     and '295199ba5efc8ddca9453992b8304f356f385efd'

38 files changed, 920 insertions, 227 deletions

diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index 0053a12fdb..555e5bc643 100644
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+           file://pkgconfig_fix.patch;patch=1"
 S = "${WORKDIR}/curl-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/packages/curl/files/.mtn2git_empty b/packages/curl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/curl/files/.mtn2git_empty
diff --git a/packages/curl/files/pkgconfig_fix.patch b/packages/curl/files/pkgconfig_fix.patch
new file mode 100644
index 0000000000..a5730095d2
--- /dev/null
+++ b/packages/curl/files/pkgconfig_fix.patch
@@ -0,0 +1,14 @@
+Index: curl-7.16.4/libcurl.pc.in
+===================================================================
+--- curl-7.16.4.orig/libcurl.pc.in	2007-02-18 09:41:27.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in	2008-02-29 12:19:32.000000000 +0000
+@@ -33,6 +33,7 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
++Requires.private: gnutls
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
diff --git a/packages/dtnrg/files/.mtn2git_empty b/packages/dtnrg/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dtnrg/files/.mtn2git_empty
diff --git a/packages/dtnrg/files/configure_fix.patch b/packages/dtnrg/files/configure_fix.patch
new file mode 100644
index 0000000000..95587c242c
--- /dev/null
+++ b/packages/dtnrg/files/configure_fix.patch
@@ -0,0 +1,22 @@
+head no longer supports "-1" syntax
+
+Index: dtn-2.5.0/oasys/aclocal/gcc.ac
+===================================================================
+--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac	2008-02-27 22:38:22.000000000 +0000
++++ dtn-2.5.0/oasys/aclocal/gcc.ac	2008-02-27 22:39:05.000000000 +0000
+@@ -83,13 +83,13 @@
+     dnl Figure out the version and set version-specific options
+     dnl
+     AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
+-      oasys_cv_prog_gccver=`$CC --version | head -1`
++      oasys_cv_prog_gccver=`$CC --version | head -n 1`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
+     ])      
+ 
+     AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
+-      oasys_cv_prog_gxxver=`$CXX --version | head -1`
++      oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
+     ])
diff --git a/packages/gnutls/gnutls-1.6.3/configure_madness.patch b/packages/gnutls/gnutls-1.6.3/configure_madness.patch
index 26111dfe96..bdee81cc54 100644
--- a/packages/gnutls/gnutls-1.6.3/configure_madness.patch
+++ b/packages/gnutls/gnutls-1.6.3/configure_madness.patch
@@ -1,7 +1,7 @@
 Index: gnutls-1.6.3/configure.in
 ===================================================================
---- gnutls-1.6.3.orig/configure.in	2007-05-25 12:28:59.000000000 +0000
-+++ gnutls-1.6.3/configure.in	2007-11-13 17:53:23.000000000 +0000
+--- gnutls-1.6.3.orig/configure.in	2008-02-29 09:58:12.000000000 +0000
++++ gnutls-1.6.3/configure.in	2008-02-29 09:58:15.000000000 +0000
 @@ -574,13 +574,13 @@
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
@@ -20,3 +20,30 @@ Index: gnutls-1.6.3/configure.in
  AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
  AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
  export ac_full
+Index: gnutls-1.6.3/lib/gnutls.pc.in
+===================================================================
+--- gnutls-1.6.3.orig/lib/gnutls.pc.in	2008-02-29 09:58:23.000000000 +0000
++++ gnutls-1.6.3/lib/gnutls.pc.in	2008-02-29 09:58:49.000000000 +0000
+@@ -18,6 +18,7 @@
+ Name: GnuTLS
+ Description: Transport Security Layer implementation for the GNU system
+ Version: @VERSION@
++Requires.private: gcrypt
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LIBGNUTLS_LIBS@ 
++Libs.private: -L${libdir} -lgnutls
+ Cflags: -I${includedir}
+Index: gnutls-1.6.3/libextra/gnutls-extra.pc.in
+===================================================================
+--- gnutls-1.6.3.orig/libextra/gnutls-extra.pc.in	2008-02-29 09:59:02.000000000 +0000
++++ gnutls-1.6.3/libextra/gnutls-extra.pc.in	2008-02-29 09:59:31.000000000 +0000
+@@ -18,7 +18,8 @@
+ Name: GnuTLS-extra
+ Description: Additional add-ons for GnuTLS licensed under GPL
+ Requires: gnutls
++Requires.private: gnutls
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls-extra
+-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
++Libs.private: -L${libdir} -lgnutls-extra
+ Cflags: -I${includedir}
diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index ddaef1dea3..be68b55d04 100644
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -6,4 +6,4 @@ SRC_URI += "\
 	file://configure_madness.patch;patch=1 \
 	"
 
-PR = "r3"
+PR = "r4"
diff --git a/packages/gtk-webcore/files/path_fixes.patch b/packages/gtk-webcore/files/path_fixes.patch
new file mode 100644
index 0000000000..adb27bdd85
--- /dev/null
+++ b/packages/gtk-webcore/files/path_fixes.patch
@@ -0,0 +1,15 @@
+Index: NRCore/configure.in
+===================================================================
+--- NRCore.orig/configure.in	2008-02-29 11:01:14.000000000 +0000
++++ NRCore/configure.in	2008-02-29 12:45:18.000000000 +0000
+@@ -67,8 +67,8 @@
+       AC_MSG_RESULT([found. Using prefix $jscore_prefix])
+       JSCORE_ENABLE=yes
+       AC_SUBST(JSCORE_ENABLE)
+-      JSCORE_LIBS="-L$jscore_prefix/lib -ljscore"
+-      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/"
++      JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore"
++      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/"
+       jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore"
+    else
+      AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX])
diff --git a/packages/gtk-webcore/osb-nrcit/.mtn2git_empty b/packages/gtk-webcore/osb-nrcit/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcit/.mtn2git_empty
diff --git a/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
new file mode 100644
index 0000000000..d26009bbb7
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: NRCit/gtk-webcore-nrcit.pc.in
+===================================================================
+--- NRCit.orig/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:41.000000000 +0000
++++ NRCit/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:51.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: gtk-webcore-nrcit
+ Description: Gtk+-WebCore HTML rendering engine, browser interface
+ Version: @VERSION@
+-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0
+-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@
++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl
++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0
+ Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 7ea8b3b6fa..57bb096183 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -5,11 +5,12 @@ PRIORITY = "optional"
 SECTION = "gpe"
 
 PV = "0.5.2+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "curl librsvg osb-nrcore pango"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
+           file://pkgconfig_fix.patch;patch=1 \
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 
 inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc
index 6fd1d22580..eca304959f 100644
--- a/packages/gtk-webcore/osb-nrcore.inc
+++ b/packages/gtk-webcore/osb-nrcore.inc
@@ -12,6 +12,8 @@ inherit autotools pkgconfig
 #/khtml/css/cssproperties.h failes to generate properly with high parallel makes
 PARALLEL_MAKE = ""
 
+EXTRA_OECONF += "--with-javascriptcore-prefix=${STAGING_EXECPREFIXDIR}"
+
 do_configure () {
 	autotools_do_configure
 	cd ${S}
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 8e0b4b04b6..b85c06e422 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -1,11 +1,12 @@
 require osb-nrcore.inc
 
 PV = "0.5.2+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
            file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
-	   file://build_silence.patch;patch=0;maxdate=20070401"
+	   file://build_silence.patch;patch=0;maxdate=20070401 \
+	   file://path_fixes.patch;patch=1"
 
 S = "${WORKDIR}/NRCore"
 
diff --git a/packages/libmatchbox/files/configure_fixes.patch b/packages/libmatchbox/files/configure_fixes.patch
new file mode 100644
index 0000000000..083d32a04f
--- /dev/null
+++ b/packages/libmatchbox/files/configure_fixes.patch
@@ -0,0 +1,79 @@
+---
+ configure.ac |   15 +++++++--------
+ libmb.pc.in  |    2 +-
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+Index: libmatchbox-1.9/configure.ac
+===================================================================
+--- libmatchbox-1.9.orig/configure.ac	2007-11-11 22:26:43.000000000 +0000
++++ libmatchbox-1.9/configure.ac	2007-11-11 22:52:09.000000000 +0000
+@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
+       xft_pkg=xft
+       SUPPORTS_XFT=1
+       AC_DEFINE(USE_XFT, [1], [Use Xft])	
++      XFT_REQUIRED="xft"
+    fi
+ # XXX : xau is missing from x11.pc - workaround is too add here 
+    PKG_CHECK_MODULES(XLIBS, x11 xext  $xft_pkg)
+@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
+     AC_DEFINE(USE_XFT, [1], [Use Xft])
+     SUPPORTS_XFT=1
+     AC_MSG_RESULT(yes)
++    XFT_REQUIRED="xft"
+   else
+ 
+     AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
+       AC_DEFINE(USE_XFT, [1], [Use Xft])
+       SUPPORTS_XFT=1    
+       AC_MSG_RESULT(yes)
++      MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
++      MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
+     fi
+   fi
+ fi
+ 
+ XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
+-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
+-
+-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
++XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
+ 
+ fi
+ 
+-# do this here for freetype include
+-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
+-
+-
+ dnl ------ Check for Pango ---------------------------------------------------
+ 
+ if test x$enable_pango != xno; then
+@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
+             AC_DEFINE(USE_PNG, [1], [Use Png])
+ 	    SUPPORTS_PNG=1
+             PNG_LIBS="-lpng -lz"
+-            MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
++            MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
+         else
+ 	    AC_MSG_WARN([*** Cannot find PNG, disabling support])
+             enable_png=no
+@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
+ AC_SUBST(XLIBS_REQUIRED)
+ AC_SUBST(PANGO_REQUIRED)
+ AC_SUBST(PNG_REQUIRED)
++AC_SUBST(XFT_REQUIRED)
+ 
+ dnl ------ Below used for mbconfig.h ----------------------------------------
+ 
+Index: libmatchbox-1.9/libmb.pc.in
+===================================================================
+--- libmatchbox-1.9.orig/libmb.pc.in	2007-11-11 22:30:47.000000000 +0000
++++ libmatchbox-1.9/libmb.pc.in	2007-11-11 22:31:01.000000000 +0000
+@@ -7,6 +7,6 @@ Name: libmb
+ Description: Utility Library used by Matchbox utilities.
+ Version: @VERSION@
+ 
+-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
+ Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
+ Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb
deleted file mode 100644
index 467a3b1d74..0000000000
--- a/packages/libmatchbox/libmatchbox_1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libmatchbox.inc
-
-PR = "r2"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb
deleted file mode 100644
index 7213e71542..0000000000
--- a/packages/libmatchbox/libmatchbox_1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libmatchbox.inc
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb
deleted file mode 100644
index 7213e71542..0000000000
--- a/packages/libmatchbox/libmatchbox_1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libmatchbox.inc
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
diff --git a/packages/libmatchbox/libmatchbox_1.5.bb b/packages/libmatchbox/libmatchbox_1.5.bb
deleted file mode 100644
index 2f63f7ee64..0000000000
--- a/packages/libmatchbox/libmatchbox_1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libmatchbox.inc
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://check.m4 \
-	   file://autofoo.patch;patch=1"
-
-do_configure_prepend () {
-	mv ${WORKDIR}/check.m4 ${S}/
-}
diff --git a/packages/libmatchbox/libmatchbox_1.6.bb b/packages/libmatchbox/libmatchbox_1.6.bb
deleted file mode 100644
index 29b04635ff..0000000000
--- a/packages/libmatchbox/libmatchbox_1.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libmatchbox.inc
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://check.m4 \
-	   file://fix-configure-for-1.9.patch;patch=1"
-
-do_configure_prepend () {
-	mv ${WORKDIR}/check.m4 ${S}/
-}
diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb
index b9044a1d60..a0c5e272c0 100644
--- a/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,10 +1,12 @@
 require libmatchbox.inc
-PR = "r1"
+
+PR = "r5"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://16bppfixes-2.patch;patch=1 \
+           file://16bppfixes.patch;patch=1 \
+           file://configure_fixes.patch;patch=1 \
            file://check.m4"
 
 do_configure_prepend () {
-	mv ${WORKDIR}/check.m4 ${S}/
+	cp ${WORKDIR}/check.m4 ${S}/
 }
diff --git a/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch b/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch
new file mode 100644
index 0000000000..d8b4d2d017
--- /dev/null
+++ b/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch
@@ -0,0 +1,44 @@
+Index: linux-2.6.24.3/arch/powerpc/kernel/idle.c
+===================================================================
+--- linux-2.6.24.3.orig/arch/powerpc/kernel/idle.c	2008-02-29 14:49:40.000000000 +0100
++++ linux-2.6.24.3/arch/powerpc/kernel/idle.c	2008-02-29 16:29:23.000000000 +0100
+@@ -19,6 +19,7 @@
+  * 2 of the License, or (at your option) any later version.
+  */
+ 
++#include <linux/leds.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/smp.h>
+@@ -51,6 +52,12 @@
+ __setup("powersave=off", powersave_off);
+ 
+ /*
++ * CPU activity indicator.
++ */
++void (*leds_idle)(int is_idle);
++EXPORT_SYMBOL(leds_idle);
++
++/*
+  * The body of the idle task.
+  */
+ void cpu_idle(void)
+@@ -64,7 +71,8 @@
+ 		while (!need_resched() && !need_resched_delayed() &&
+ 				!cpu_should_die()) {
+ 			ppc64_runlatch_off();
+-
++            if (leds_idle)
++              leds_idle(1);
+ 			if (ppc_md.power_save) {
+ 				clear_thread_flag(TIF_POLLING_NRFLAG);
+ 				/*
+@@ -99,6 +107,8 @@
+ 		if (cpu_should_die())
+ 			cpu_die();
+ 		__preempt_enable_no_resched();
++        if (leds_idle)
++          leds_idle(0);
+ 		schedule();
+ 		preempt_disable();
+ 	}
diff --git a/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch b/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch
new file mode 100644
index 0000000000..2495b9b3f7
--- /dev/null
+++ b/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch
@@ -0,0 +1,554 @@
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig	2008-02-29 13:56:08.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig	2008-02-29 13:56:11.000000000 +0100
+@@ -130,6 +130,15 @@
+ 	  This allows LEDs to be controlled by a programmable timer
+ 	  via sysfs. If unsure, say Y.
+ 
++config LEDS_TRIGGER_CPU_ACTIVITY
++	tristate "LED CPU Activity Trigger"
++	depends on LEDS_TRIGGERS
++	help
++	  This allows LEDs to be set to show cpu activity via sysfs.
++	  The LED will blink when the cpu is active and stay steady
++	  (on or off according to the trigger selected) when idle.
++	  Platform support is needed for this to work. If unsure, say Y.
++
+ config LEDS_TRIGGER_IDE_DISK
+ 	bool "LED IDE Disk Trigger"
+ 	depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
+Index: linux-2.6.24.3/drivers/leds/ledtrig-cpu.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/ledtrig-cpu.c	2008-02-29 13:56:11.000000000 +0100
+@@ -0,0 +1,502 @@
++/*
++ * LEDs CPU activity trigger
++ *
++ * Author: John Bowler <jbowler@acm.org>
++ *
++ * Copyright (c) 2006 John Bowler
++ *
++ * Permission is hereby granted, free of charge, to any
++ * person obtaining a copy of this software and associated
++ * documentation files (the "Software"), to deal in the
++ * Software without restriction, including without
++ * limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of
++ * the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the
++ * following conditions:
++ *
++ * The above copyright notice and this permission notice
++ * shall be included in all copies or substantial portions
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
++ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
++ * SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include <linux/ctype.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/spinlock.h>
++#include <linux/timer.h>
++#include <linux/device.h>
++
++#include <linux/leds.h>
++#include "leds.h"
++
++//#include <linux/list.h>
++//#include <linux/sysdev.h>
++
++
++/*
++ * To simplify this the LED state is given for each case of
++ * CPU state - idle or active.  The LED can be:
++ *
++ * off
++ * flash - slow for idle, fast (flicker) for active
++ * on
++ *
++ * This gives two useless states - off/off and on/on
++ */
++typedef enum cpu_trigger_led_state {
++	cpu_led_off,
++	cpu_led_flash,
++	cpu_led_on,
++	cpu_led_invalid
++} cpu_trigger_led_state;
++
++static const char *const cpu_trigger_names[] = {
++	"off",
++	"flash",
++	"on",
++	"invalid"
++};
++
++/* Forward declaration - this is called back when an LED property
++ * is changed.
++ */
++static void leds_cpu_trigger_state_change(void);
++
++/*
++ * These constants define the actual mark/space of the flashing
++ * in jiffies.  msecs_to_jiffies rounds up and is compile time
++ * evaluable for constant arguments.  Writing the ?: stuff below
++ * this way ensures the compiler doesn't think it needs to
++ * compile in the math of msecs_to_jiffies.
++ *
++ * These values have been determined by experiment to work well
++ * for the ready/status LED on a LinkSys NSLU2 (light piped) and
++ * for the user LED on a Loft (Gateway Avila variant) board where
++ * the LED was directly visible.  Light Output Varies Everywhere.
++ */
++#define LEDS_CPU_ACTIVE_MARK	msecs_to_jiffies(40)
++#define LEDS_CPU_IDLE_MARK	msecs_to_jiffies(800)
++#define LEDS_CPU_ACTIVE_SPACE	msecs_to_jiffies(60)
++#define LEDS_CPU_IDLE_SPACE	msecs_to_jiffies(800)
++
++
++/*
++ * Individual LEDs ------------------------------------------------------------
++ */
++struct cpu_trigger_data {
++	cpu_trigger_led_state active; /* Behaviour when the CPU is active. */
++	cpu_trigger_led_state idle;   /* Behaviour when the CPU is idle. */
++};
++
++/*
++ * LED state change - called when the state of a single LED might
++ * have changed.  Returns true if the LED is blinking.  The argument
++ * is the blink state - the brightness of the blinking LED.
++ */
++static int leds_cpu_trigger_led_state_change(struct led_classdev *led,
++		int is_active, enum led_brightness brightness)
++{
++	int is_blinking = 0;
++
++	struct cpu_trigger_data *data = led->trigger_data;
++
++	/* Find the new brightness for the LED, if the LED is
++	 * set to flash then the brightness passed in is the
++	 * required value.
++	 */
++	if (likely(data != 0))
++		switch (is_active ? data->active : data->idle) {
++		case cpu_led_off:   brightness = LED_OFF;  break;
++		case cpu_led_flash: is_blinking = 1;       break;
++		case cpu_led_on:    brightness = LED_FULL; break;
++		}
++	else
++		brightness = is_active ? LED_FULL : LED_OFF;
++
++	led_set_brightness(led, brightness);
++
++	return is_blinking;
++}
++
++/*
++ * sysfs properties, the property is output at an list of the
++ * values with the current setting enclosed in []
++ */
++static ssize_t leds_cpu_trigger_show_prop(struct device *dev,
++		struct device_attribute *attr, char *buf, size_t where)
++{
++	struct led_classdev     *led = dev_get_drvdata(dev);
++	cpu_trigger_led_state  item = cpu_led_invalid, i;
++	char                  *next;
++
++	if (likely(led->trigger_data != 0))
++		item = *(const cpu_trigger_led_state*)(
++				led->trigger_data + where);
++
++	for (i=0, next=buf; i<cpu_led_invalid; ++i) {
++		const char *name = cpu_trigger_names[i];
++		size_t len = strlen(name);
++
++		if (i == item)
++			*next++ = '[';
++		memcpy(next, name, len);
++		next += len;
++		if (i == item)
++			*next++ = ']';
++		*next++ = ' ';
++	}
++
++	next[-1] = '\n';
++	*next++ = 0;
++
++	return next - buf;
++}
++
++static ssize_t leds_cpu_trigger_show_active(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	return leds_cpu_trigger_show_prop(dev, attr, buf,
++			offsetof(struct cpu_trigger_data, active));
++}
++
++static ssize_t leds_cpu_trigger_show_idle(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	return leds_cpu_trigger_show_prop(dev, attr, buf,
++			offsetof(struct cpu_trigger_data, idle));
++}
++
++/*
++ * Any matching leading substring selects a property - so "onoffonoff"
++ * sets the property to off.
++ */
++static ssize_t leds_cpu_trigger_store_prop(struct device *dev,
++		struct device_attribute *attr, const char *buf,
++		size_t size, size_t where)
++{
++	size_t rc = 0;
++	cpu_trigger_led_state value = 0/*sic*/;
++	struct led_classdev *led;
++
++	/* ignore space characters before the value. */
++	while (rc < size && isspace(buf[rc]))
++		++rc;
++	if (rc >= size)
++		return rc;
++
++	/* look for a simple match against the trigger name, case
++	 * sensitive.
++	 */
++	do {
++		const char *name = cpu_trigger_names[value];
++		size_t len = strlen(name);
++		if (len <= size && memcmp(buf+rc, name, len) == 0) {
++			rc = len;
++			break;
++		}
++		if (++value >= cpu_led_invalid)
++			return -EINVAL;
++	} while (1);
++
++	led = dev_get_drvdata(dev);
++	if (likely(led->trigger_data != 0))
++		*(cpu_trigger_led_state*)(
++				led->trigger_data + where) = value;
++
++	return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_active(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t size)
++{
++	ssize_t rc = leds_cpu_trigger_store_prop(dev, attr, buf, size,
++			offsetof(struct cpu_trigger_data, active));
++	/*
++	 * At least one CPU must be active (otherwise who is doing this?)
++	 * Call down into the global state below to cause an update
++	 * to happen now.
++	 */
++	leds_cpu_trigger_state_change();
++	return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_idle(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t size)
++{
++	return leds_cpu_trigger_store_prop(dev, attr, buf, size,
++			offsetof(struct cpu_trigger_data, idle));
++}
++
++static DEVICE_ATTR(active, 0644, leds_cpu_trigger_show_active,
++					leds_cpu_trigger_store_active);
++
++static DEVICE_ATTR(idle, 0644, leds_cpu_trigger_show_idle,
++					leds_cpu_trigger_store_idle);
++
++/*
++ * Activate and deactivate are called on individual LEDs when the
++ * LED trigger property is changed.
++ */
++static void leds_cpu_trigger_activate(struct led_classdev *led)
++{
++	/*
++	 * The initial setting of the trigger is simple CPU activity
++	 * with the LED off for idle and on for active.  Consequently
++	 * there is no need to mess with the global state initially,
++	 * we know the CPU is active at this moment!
++	 */
++	int rc;
++	struct cpu_trigger_data *data = kmalloc(sizeof *data, GFP_KERNEL);
++	if (unlikely(data == 0))
++		return;
++
++	data->active = cpu_led_on;
++	data->idle = cpu_led_off;
++	led->trigger_data = data;
++
++	rc = device_create_file(led->dev, &dev_attr_active);
++	if (rc)
++		goto err_out;
++	rc = device_create_file(led->dev, &dev_attr_idle);
++	if (rc)
++		goto err_out_active;
++
++	led_set_brightness(led, LED_FULL);
++	return;
++
++err_out_active:
++	device_remove_file(led->dev, &dev_attr_active);
++err_out:
++	led->trigger_data = NULL;
++	kfree(data);
++}
++
++static void leds_cpu_trigger_deactivate(struct led_classdev *led)
++{
++	struct cpu_trigger_data *data = led->trigger_data;
++	if (likely(data != 0)) {
++		led_set_brightness(led, LED_OFF);
++
++		device_remove_file(led->dev, &dev_attr_idle);
++		device_remove_file(led->dev, &dev_attr_active);
++
++		led->trigger_data = 0;
++		kfree(data);
++	}
++}
++
++
++/*
++ * Global state  --------------------------------------------------------------
++ *
++ * This is global because the CPU state is global and we only need one timer to
++ * do this stuff.
++ */
++typedef struct leds_cpu_trigger_data {
++	struct led_trigger trigger; /* the lock in here protects everything */
++	struct timer_list  timer;
++	unsigned long      last_active_time; /* record of last jiffies */
++	unsigned long      last_idle_time;   /* record of last jiffies */
++	int                count_active;     /* number of active CPUs */
++} leds_cpu_trigger_data;
++
++/*
++ * Mark state - uses the current time (jiffies) to work out
++ * whether this is a mark or space.
++ */
++static int leds_cpu_trigger_mark(struct leds_cpu_trigger_data *data,
++		unsigned long now) {
++	if (data->count_active > 0) {
++		unsigned long elapsed = now - data->last_active_time;
++		elapsed %= LEDS_CPU_ACTIVE_SPACE + LEDS_CPU_ACTIVE_MARK;
++		data->last_active_time = now - elapsed;
++		return elapsed > LEDS_CPU_ACTIVE_SPACE;
++	} else {
++		unsigned long elapsed = now - data->last_idle_time;
++		elapsed %= LEDS_CPU_IDLE_SPACE + LEDS_CPU_IDLE_MARK;
++		data->last_idle_time = now - elapsed;
++		return elapsed > LEDS_CPU_IDLE_SPACE;
++	}
++}
++
++
++/*
++ * State change - given information about the nature of the
++ * (possible) state change call up to each LED to adjust its
++ * state.  Returns true if any LED is blinking.  The lock
++ * must be held (a read lock is adequate).
++ */
++static int leds_cpu_trigger_scan_leds(struct leds_cpu_trigger_data *data,
++		unsigned long now)
++{
++	int blinking = 0;
++	const int active = data->count_active > 0;
++	const enum led_brightness brightness =
++		leds_cpu_trigger_mark(data, now) ? LED_FULL : LED_OFF;
++	struct list_head *entry;
++
++	list_for_each(entry, &data->trigger.led_cdevs) {
++		struct led_classdev *led =
++			list_entry(entry, struct led_classdev, trig_list);
++
++		blinking |= leds_cpu_trigger_led_state_change(led,
++				active, brightness);
++	}
++
++	return blinking;
++}
++
++/*
++ * Set the timer correctly according to the current state, the lock
++ * must be held for write.
++ */
++static void leds_cpu_trigger_set_timer(struct leds_cpu_trigger_data *state,
++		unsigned long now)
++{
++	unsigned long next;
++	if (state->count_active > 0) {
++		next = state->last_active_time;
++		if (now - next > LEDS_CPU_ACTIVE_SPACE)
++			next += LEDS_CPU_ACTIVE_MARK;
++		next += LEDS_CPU_ACTIVE_SPACE;
++	} else {
++		next = state->last_idle_time;
++		if (now - next > LEDS_CPU_IDLE_SPACE)
++			next += LEDS_CPU_IDLE_MARK;
++		next += LEDS_CPU_IDLE_SPACE;
++	}
++	mod_timer(&state->timer, next);
++}
++
++/*
++ * The timer callback if the LED is currently flashing, the callback
++ * calls the state change function and, if that returns true, meaning
++ * that at least one LED is still blinking, the timer is restarted
++ * with the correct timeout.
++ */
++static void leds_cpu_trigger_timer_callback(unsigned long data)
++{
++	struct leds_cpu_trigger_data *state =
++				(struct leds_cpu_trigger_data *)data;
++
++	write_lock(&state->trigger.leddev_list_lock);
++	{
++		unsigned long now = jiffies;
++
++		/* If at least one LED is set to flash; set the timer
++		 * again (this won't reset the timer set within the
++		 * idle loop).
++		 */
++		if (leds_cpu_trigger_scan_leds(state, now))
++			leds_cpu_trigger_set_timer(state, now);
++	}
++	write_unlock(&state->trigger.leddev_list_lock);
++}
++
++
++/*
++ * There is one global control structure, one timer and one set
++ * of state for active CPUs shared across all the LEDs.  Individual
++ * LEDs say how this state to be handled.  It is currently *not*
++ * possible to show per-cpu activity on individual LEDs, the code
++ * maintains a count of active CPUs and the state is only 'idle'
++ * if all CPUs are idle.
++ */
++static struct leds_cpu_trigger_data leds_cpu_trigger = {
++	.trigger = {
++		.name       = "cpu",
++		.activate   = leds_cpu_trigger_activate,
++		.deactivate = leds_cpu_trigger_deactivate,
++	} ,
++	.timer   = TIMER_INITIALIZER(leds_cpu_trigger_timer_callback, 0,
++			(unsigned long)&leds_cpu_trigger),
++	.last_active_time = 0,
++	.last_idle_time   = 0,
++	.count_active     = 0,
++};
++
++/*
++ * State change - callback from an individual LED on a property change which
++ * might require a redisplay.
++ */
++static void leds_cpu_trigger_state_change() {
++	write_lock(&leds_cpu_trigger.trigger.leddev_list_lock);
++	{
++		unsigned long now = jiffies;
++
++		if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now) &&
++			!timer_pending(&leds_cpu_trigger.timer))
++			leds_cpu_trigger_set_timer(&leds_cpu_trigger, now);
++	}
++	write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock);
++}
++
++/*
++ * Called from every CPU at the start and end of the idle loop.
++ * The active count is initially 0, even though CPUs are running,
++ * so the code below must check for the resultant underflow.
++ *
++ * If the idle behaviour is 'flash' then when the timer times out
++ * it will take the CPU out of idle, set the active state (which
++ * may also be flash), drop back into idle and reset the timer to
++ * the idle timeout...
++ */
++static void leds_cpu_trigger_idle(int is_idle)
++{
++	write_lock(&leds_cpu_trigger.trigger.leddev_list_lock);
++	if ((is_idle && leds_cpu_trigger.count_active > 0 &&
++				--leds_cpu_trigger.count_active == 0) ||
++	    (!is_idle && leds_cpu_trigger.count_active < num_online_cpus() &&
++	     			++leds_cpu_trigger.count_active == 1)) {
++		unsigned long now = jiffies;
++
++		/* State change - the system just became idle or active,
++		 * call the del_timer first in an attempt to minimise
++		 * getting a timer interrupt which will take us unnecessarily
++		 * out of idle (this doesn't matter).
++		 */
++		del_timer(&leds_cpu_trigger.timer);
++		if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now))
++			leds_cpu_trigger_set_timer(&leds_cpu_trigger, now);
++	}
++	write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock);
++}
++
++/*
++ * Module init and exit - register the trigger, then store
++ * the idle callback in the arch-specific global.  For this
++ * module to link (into the kernel) or load (into a running
++ * kernel) the architecture must define the leds_idle global.
++ */
++static int __init leds_cpu_trigger_init(void)
++{
++	int rc = led_trigger_register(&leds_cpu_trigger.trigger);
++	leds_idle = leds_cpu_trigger_idle;
++	return rc;
++}
++module_init(leds_cpu_trigger_init);
++
++static void __exit leds_cpu_trigger_exit(void)
++{
++	leds_idle = 0;
++	del_timer_sync(&leds_cpu_trigger.timer);
++	led_trigger_unregister(&leds_cpu_trigger.trigger);
++}
++module_exit(leds_cpu_trigger_exit);
++
++MODULE_AUTHOR("John Bowler <jbowler@acm.org>");
++MODULE_DESCRIPTION("CPU activity LED trigger");
++MODULE_LICENSE("Dual MIT/GPL");
+Index: linux-2.6.24.3/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Makefile	2008-02-29 13:56:08.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Makefile	2008-02-29 13:56:11.000000000 +0100
+@@ -24,3 +24,4 @@
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
+ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
+ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
++obj-$(CONFIG_LEDS_TRIGGER_CPU_ACTIVITY)	+= ledtrig-cpu.o
+Index: linux-2.6.24.3/include/linux/leds.h
+===================================================================
+--- linux-2.6.24.3.orig/include/linux/leds.h	2008-02-29 13:56:08.000000000 +0100
++++ linux-2.6.24.3/include/linux/leds.h	2008-02-29 13:56:11.000000000 +0100
+@@ -124,4 +124,13 @@
+ };
+ 
+ 
++/*
++ * CPU activity indication.
++ */
++/* Idle callback - call with is_idle==1 at the start of the idle loop
++ * and with is_idle==0 at the end.  This symbol must be defined by
++ * the arch core to be able to use LEDS_TRIGGER_CPU_ACTIVITY
++ */
++extern void (*leds_idle)(int is_idle);
++
+ #endif		/* __LINUX_LEDS_H_INCLUDED */
diff --git a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
index 11b37d3ec1..a49497ccb2 100644
--- a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
+++ b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.3-rt3
-# Fri Feb 29 00:48:47 2008
+# Fri Feb 29 13:59:05 2008
 #
 # CONFIG_PPC64 is not set
 
@@ -1356,6 +1356,7 @@ CONFIG_LEDS_MPC8313E_RDB=m
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index 61fd734632..8081f44e93 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -13,6 +13,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
            file://sysctl_missing_include.patch;patch=1 \
            file://powerpc-clockres.patch;patch=1 \
+           file://leds-cpu-activity.patch;patch=1 \
+           file://leds-cpu-activity-powerpc.patch;patch=1 \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.24.3"
diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch
new file mode 100644
index 0000000000..5ca98a9164
--- /dev/null
+++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch
@@ -0,0 +1,15 @@
+Index: matchbox-desktop-0.9.1/matchbox-desktop.pc.in
+===================================================================
+--- matchbox-desktop-0.9.1.orig/matchbox-desktop.pc.in	2008-02-29 13:48:39.000000000 +0000
++++ matchbox-desktop-0.9.1/matchbox-desktop.pc.in	2008-02-29 13:49:07.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: matchbox-desktop
+ Description: Matchbox Desktop module dependencies.
+ Version: @VERSION@
+-Libs: -L${libdir} @LIBMB_LIBS@
+-Cflags: -I${includedir}/matchbox-desktop @LIBMB_CFLAGS@
+\ No newline at end of file
++Requires: libmb
++Libs: -L${libdir}
++Cflags: -I${includedir}/matchbox-desktop
+\ No newline at end of file
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 4aba935386..d3be3b166e 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
+           file://pkgconfig_fix.patch;patch=1 \
            file://mb-desktop-multi-category-matching.patch;patch=1"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
diff --git a/packages/matchbox-wm/matchbox-wm/configure_fix.patch b/packages/matchbox-wm/matchbox-wm/configure_fix.patch
new file mode 100644
index 0000000000..52cea0e8f7
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/configure_fix.patch
@@ -0,0 +1,13 @@
+Index: matchbox-window-manager/configure.ac
+===================================================================
+--- matchbox-window-manager.orig/configure.ac	2007-11-14 12:02:28.000000000 +0000
++++ matchbox-window-manager/configure.ac	2007-11-14 12:18:55.000000000 +0000
+@@ -283,7 +283,7 @@
+     yes)
+ 
+ 	case "$expat" in
+-	  yes)
++	  yes|"")
+ 		EXPAT_LIBS="-lexpat"
+ 		;;
+ 	    *)
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
deleted file mode 100644
index 58da385674..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
-	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools  pkgconfig
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/bluebox/matchbox \
-	       ${datadir}/themes/borillo/matchbox"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
-
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
-}
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
deleted file mode 100644
index 58da385674..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
-	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools  pkgconfig
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/bluebox/matchbox \
-	       ${datadir}/themes/borillo/matchbox"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
-
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
-}
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
deleted file mode 100644
index a85e4b23c4..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-PR = "r2"
-
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
-
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools  pkgconfig
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${sysconfdir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/Default/matchbox \
-	       ${datadir}/themes/MBOpus/matchbox"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
-
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
-}
-
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
deleted file mode 100644
index c2016cab66..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-PR = "r3"
-
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
-	   file://kbdconfig"
-
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools pkgconfig update-alternatives
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${sysconfdir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/Default/matchbox \
-	       ${datadir}/themes/MBOpus/matchbox"
-
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
-
-do_install_prepend() {
-	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
-}
-
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
deleted file mode 100644
index 80b6dc7e19..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
-	   file://kbdconfig"
-
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools pkgconfig update-alternatives
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${sysconfdir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/Default/matchbox \
-	       ${datadir}/themes/MBOpus/matchbox"
-
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
-
-do_install_prepend() {
-	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
-}
-
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb
deleted file mode 100644
index 700fb15eeb..0000000000
--- a/packages/matchbox-wm/matchbox-wm_0.9.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require matchbox-wm.inc
-
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
-RDEPENDS = ""
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz"
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools  pkgconfig
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/bluebox/matchbox \
-	       ${datadir}/themes/borillo/matchbox"
-
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
-
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
-}
diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb
index bf57441815..78795f7a40 100644
--- a/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.2.bb
@@ -3,9 +3,10 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native "
 RDEPENDS = ""
 
-PR="r3"
+PR="r4"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
+SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
+           file://configure_fix.patch;patch=1 \
            file://gconf-2.m4 \
            file://kbdconfig"
 
@@ -29,7 +30,8 @@ ALTERNATIVE_PRIORITY = "10"
 EXTRA_OECONF = " \
                 --enable-startup-notification\
 		--enable-gconf \
-		--enable-expat \
+		 --with-expat-lib=${STAGING_LIBDIR} \
+		 --with-expat-includes=${STAGING_INCDIR} \
 		--disable-xrm"
 
 do_configure_prepend () {
diff --git a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch b/packages/pango/pango-1.18.3/pkgconfig_fixes.patch
new file mode 100644
index 0000000000..f021591a91
--- /dev/null
+++ b/packages/pango/pango-1.18.3/pkgconfig_fixes.patch
@@ -0,0 +1,79 @@
+Index: pango-1.18.1/configure.in
+===================================================================
+--- pango-1.18.1.orig/configure.in	2007-08-28 00:29:54.000000000 +0000
++++ pango-1.18.1/configure.in	2007-11-12 19:21:22.000000000 +0000
+@@ -226,13 +226,9 @@
+   #
+   # Checks for FreeType
+   #
+-  FREETYPE_LIBS=
+-  FREETYPE_CFLAGS=
+-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-  if test "x$FREETYPE_CONFIG" != "xno" ; then
+-    FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
++  PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no]))
+ 
++  if $have_freetype ; then
+     pango_save_ldflags=$LDFLAGS
+     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+     AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
+Index: pango-1.18.1/pangoft2-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2-uninstalled.pc.in	2007-11-12 19:23:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango FT2 Uninstalled
+ Description: Freetype 2.0 font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
++Requires: pango freetype2
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+ 
+Index: pango-1.18.1/pangoft2.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2.pc.in	2007-11-12 19:27:05.000000000 +0000
+@@ -6,7 +6,7 @@
+ Name: Pango FT2
+ Description: Freetype 2.0 font support for Pango
+ Version: @VERSION@
+-Requires: pango
+-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango freetype2 fontconfig
++Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@
++Cflags: -I${includedir}/pango-1.0
+ 
+Index: pango-1.18.1/pangoxft-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft-uninstalled.pc.in	2007-11-12 19:22:24.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango Xft Uninstalled
+ Description: Xft font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango xft
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@
+ 
+Index: pango-1.18.1/pangoxft.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft.pc.in	2007-11-12 19:21:57.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: Pango Xft
+ Description: Xft font support for Pango
+ Version: @VERSION@
+-Requires: pango pangoft2
+-Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
++Requires: pango pangoft2 xft
++Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@
++Cflags: -I${includedir}/pango-1.0
diff --git a/packages/pango/pango_1.18.3.bb b/packages/pango/pango_1.18.3.bb
index 9656f30376..4069cecebd 100644
--- a/packages/pango/pango_1.18.3.bb
+++ b/packages/pango/pango_1.18.3.bb
@@ -1,4 +1,4 @@
 require pango.inc
 
-DEFAULT_PREFERENCE = "-1"
+SRC_URI += "file://pkgconfig_fixes.patch;patch=1"
 
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
new file mode 100644
index 0000000000..0790d4c32b
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.pc.in
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.pc.in	2008-02-29 12:29:02.000000000 +0000
++++ xorg-server-1.4/xorg-server.pc.in	2008-02-29 12:27:36.000000000 +0000
+@@ -7,6 +7,7 @@
+ 
+ Name: xorg-server
+ Description: Modular X.Org X Server
++Requires: pixman
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index c87090197c..30ae4a2e3d 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://fbdev-evdev.patch;patch=1 \
 	file://keyboard-resume-workaround.patch;patch=1 \
 	file://xorg-avr32-support.diff;patch=1 \
+	file://pkgconfig_fix.patch;patch=1 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"