merge of 'dee683d3de0616c362d03b01a6bf3caa2da5423c'

     and 'ee048875cfe4eb10e9fae21dc07aaa545d4f29fc'

8 files changed, 18 insertions, 172 deletions

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 () {