libmatchbox 1.9 fix bug #2048

5 files changed, 23 insertions, 41 deletions

diff --git a/packages/libmatchbox/files/reset-sigchld.patch b/packages/libmatchbox/files/reset-sigchld.patch
new file mode 100644
index 0000000000..5792385d27
--- /dev/null
+++ b/packages/libmatchbox/files/reset-sigchld.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libmatchbox-1.9/libmb/mbutil.c~reset-sigchld
++++ libmatchbox-1.9/libmb/mbutil.c
+@@ -92,6 +92,7 @@
+     }
+ 
+   argv[nargs] = NULL;
++  signal(SIGCHLD, SIG_DFL);
+   rc = execvp (argv[0], argv);
+ 
+   for (i = 0; i < nargs; i++)
diff --git a/packages/libmatchbox/libmatchbox_1.7.bb b/packages/libmatchbox/libmatchbox_1.7.bb
deleted file mode 100644
index 7900d4e085..0000000000
--- a/packages/libmatchbox/libmatchbox_1.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libmatchbox.inc
-PR = "r2"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://svn-explicit-types.patch;patch=1 \
-	   file://svn-autofu-xsettings.patch;patch=1 \
-	   file://svn-code-misc-xsettings.patch;patch=1 \
-	   file://check.m4"
-
-do_configure_prepend () {
-	mv ${WORKDIR}/check.m4 ${S}/
-}
diff --git a/packages/libmatchbox/libmatchbox_1.8.bb b/packages/libmatchbox/libmatchbox_1.8.bb
deleted file mode 100644
index d87eb09150..0000000000
--- a/packages/libmatchbox/libmatchbox_1.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libmatchbox.inc
-PR = "r0"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://check.m4"
-
-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 a0c5e272c0..b462dc5aca 100644
--- a/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,11 +1,13 @@
 require libmatchbox.inc
+PR = "r6"
 
-PR = "r5"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-           file://16bppfixes.patch;patch=1 \
-           file://configure_fixes.patch;patch=1 \
-           file://check.m4"
+SRC_URI = "\
+  http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
+  file://16bppfixes.patch;patch=1 \
+  file://configure_fixes.patch;patch=1 \
+  file://reset-sigchld.patch;patch=1 \
+  file://check.m4\
+"
 
 do_configure_prepend () {
 	cp ${WORKDIR}/check.m4 ${S}/
diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
deleted file mode 100644
index f22b676cd9..0000000000
--- a/packages/libmatchbox/libmatchbox_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require libmatchbox.inc
-
-PV = "1.7+svn${SRCDATE}"
-DEFAULT_PREFERENCE = "-1"
-PR="1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
-	   file://check.m4 \
-	   file://16bppfixes.patch;patch=1"
-S = "${WORKDIR}/libmatchbox"
-
-do_configure_prepend () {
-        mv ${WORKDIR}/check.m4 ${S}/
-}