summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-17 16:26:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:57 +0000
commit7f2c15b4b11181ea58254f8be0e31b73e24a04e7 (patch)
tree6c265f49afaeed17b4e30bf3f2f91022052e3cb0
parent4bb14875e17e99f8b79a1b874ac956388d9c69d3 (diff)
downloadpoky-7f2c15b4b11181ea58254f8be0e31b73e24a04e7.tar.gz
matchbox-wm-2: remove
Matchbox Window Manager 2 is more of a framework than a window manager, certainly isn't ready to replace v1 yet, and isn't under active development. (From OE-Core rev: 94a97a5b40484b4e02e704cc56ba40fc62496107) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch21
-rw-r--r--meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb45
2 files changed, 0 insertions, 66 deletions
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
deleted file mode 100644
index 1f877d76fe..0000000000
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Accepted
2Instead matchbox-window-manager-2, it is in libmatchboxwm2, which has build
3failure as partial gtk-doc implementation.
4
5Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
6Fix following build error:
7| Makefile:734: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
8| ERROR: oe_runmake failed
9
10Index: matchbox-window-manager-2/Makefile.am
11===================================================================
12--- matchbox-window-manager-2.orig/Makefile.am
13+++ matchbox-window-manager-2/Makefile.am
14@@ -3,6 +3,6 @@ SUBDIRS = matchbox data doc util
15 # Extra clean files so that maintainer-clean removes *everything*
16
17 snapshot:
18- $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
19+ $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
20
21 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
deleted file mode 100644
index 7369339899..0000000000
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://matchbox/core/mb-wm.h;endline=21;md5=1b1d328a527906350ea7ce7ab1bb7564"
5
6DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pango libxdamage libxcomposite gtk+"
7
8SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
9PV = "0.1+git${SRCPV}"
10PR = "r2"
11
12SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \
13 file://fix_makefile.patch \
14 "
15
16S = "${WORKDIR}/git"
17
18inherit autotools pkgconfig update-alternatives
19
20# Change this to x-session-manager->matchbox-session and put in
21# matchbox-session, then change this to x-window-manager to
22# matchbox-window-manager-2.
23ALTERNATIVE_${PN} = "x-window-manager"
24ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/matchbox-window-manager"
25ALTERNATIVE_PRIORITY = "10"
26
27PACKAGES =+ "libmatchbox2"
28
29FILES_libmatchbox2 = "${libdir}/*${SOLIBS}"
30
31FILES_${PN} += "${datadir}/matchbox-2 \
32 ${sysconfdir}/matchbox-2 \
33 ${datadir}/themes/*"
34
35EXTRA_OECONF = "--enable-debug \
36 --enable-simple-manager \
37 --enable-compositing-manager \
38 --enable-libmatchbox \
39 --enable-png-theme \
40 "
41
42do_install_append () {
43 cd ${D}${bindir}
44 ln -s matchbox-window-manager-2-simple matchbox-window-manager
45}