3 files changed, 19 insertions, 3 deletions
diff --git a/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch
new file mode 100644
index 000000000..52cea0e8f
--- /dev/null
+++ b/meta/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/meta/packages/matchbox-wm/matchbox-wm_1.2.bb b/meta/packages/matchbox-wm/matchbox-wm_1.2.bb
index 78c5be62e..31a2e932b 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_1.2.bb
@@ -2,10 +2,11 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
-	   file://kbdconfig \
+           file://configure_fix.patch;patch=1 \
+           file://kbdconfig \
            file://gconf-2.m4"
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
index 457d4c8df..22809bd2b 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,9 +3,11 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
 PV = "1.2+svnr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
-	   file://kbdconfig"
+           file://configure_fix.patch;patch=1 \
+           file://kbdconfig"
 
 S = "${WORKDIR}/matchbox-window-manager"