libmatchbox: Fix so reconfiguring works (cp, not mv files). Add configure patch to...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3112 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
index 52b320d661ac5e8587b06ff8fd9eb6678a4382eb..be6d1884d68ea5d57c5f5e45b3d1226fb677fb46 100644 (file)
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.7.bb
@@ -4,5 +4,5 @@ SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.t
           file://check.m4"
 
 do_configure_prepend () {
-       mv ${WORKDIR}/check.m4 ${S}/
+       cp ${WORKDIR}/check.m4 ${S}/
 }

diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index 03be54a0758aabfc2ed621691b4c5a29487a5d86..a0c5e272c0d17db328f64fec38a2cc63e122ddf6 100644 (file)
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,11 +1,12 @@
 require libmatchbox.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
            file://16bppfixes.patch;patch=1 \
-          file://check.m4"
+           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/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index c16ea3cf43705ac0735835a68338fdaf77a035ff..f203da56c5c50530ae7e1a699581f0a6e3154934 100644 (file)
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/packages/libmatchbox/libmatchbox_svn.bb
@@ -3,11 +3,13 @@ require libmatchbox.inc
 PV = "1.7+svnr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+           file://configure_fixes.patch;patch=1 \
           file://check.m4 \
           file://16bppfixes.patch;patch=1"
+
 S = "${WORKDIR}/libmatchbox"
 
 do_configure_prepend () {
-        mv ${WORKDIR}/check.m4 ${S}/
+        cp ${WORKDIR}/check.m4 ${S}/
 }