diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2012-01-04 22:30:51 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 22:19:22 +0000 |
commit | c226ccb90624c6234c2a37a7d2c1adfeb2e98f51 (patch) | |
tree | aa0c29b35749d0d3519f74bf870c8f1d4bf1f219 /meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | |
parent | 198f2ac06e60245750a2c6561b8c8e2eaa93f6be (diff) | |
download | poky-c226ccb90624c6234c2a37a7d2c1adfeb2e98f51.tar.gz |
matchbox-wm: Remove x-session-manager handling
Windows manager should be independent on session manager, especially when we
have multiple session manager like mini-x and matchbox session.
This commit remove session-manager stuff in matchbox-wm, as matchbox-session
already has duplicated code. Also adjust alternative priority for mini-X to
make it higher priority over matchbox-session.
(From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb')
-rw-r--r-- | meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb index 84b966a743..26283266ae 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | |||
@@ -2,7 +2,7 @@ SECTION = "x11/wm" | |||
2 | DESCRIPTION = "Matchbox window manager" | 2 | DESCRIPTION = "Matchbox window manager" |
3 | LICENSE = "GPLv2.0+" | 3 | LICENSE = "GPLv2.0+" |
4 | DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" | 4 | DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" |
5 | PR = "r4" | 5 | PR = "r5" |
6 | 6 | ||
7 | SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ | 7 | SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ |
8 | file://configure_fix.patch \ | 8 | file://configure_fix.patch \ |
@@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match | |||
11 | 11 | ||
12 | S = "${WORKDIR}/matchbox-window-manager-${PV}" | 12 | S = "${WORKDIR}/matchbox-window-manager-${PV}" |
13 | 13 | ||
14 | inherit autotools pkgconfig update-alternatives | 14 | inherit autotools pkgconfig |
15 | 15 | ||
16 | FILES_${PN} = "${bindir}/* \ | 16 | FILES_${PN} = "${bindir}/* \ |
17 | ${datadir}/matchbox \ | 17 | ${datadir}/matchbox \ |
@@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \ | |||
20 | ${datadir}/themes/Default/matchbox \ | 20 | ${datadir}/themes/Default/matchbox \ |
21 | ${datadir}/themes/MBOpus/matchbox" | 21 | ${datadir}/themes/MBOpus/matchbox" |
22 | 22 | ||
23 | ALTERNATIVE_NAME = "x-session-manager" | ||
24 | ALTERNATIVE_LINK = "${bindir}/x-session-manager" | ||
25 | ALTERNATIVE_PATH = "${bindir}/matchbox-session" | ||
26 | ALTERNATIVE_PRIORITY = "10" | ||
27 | |||
28 | EXTRA_OECONF = " --enable-startup-notification \ | 23 | EXTRA_OECONF = " --enable-startup-notification \ |
29 | --disable-xrm \ | 24 | --disable-xrm \ |
30 | --enable-expat \ | 25 | --enable-expat \ |