From patchwork Tue Jan 3 06:19:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 059/113] matchbox-wm: Remove x-session-manager handling Date: Tue, 03 Jan 2012 06:19:45 -0000 From: Saul Wold X-Patchwork-Id: 18091 Message-Id: <2e333602ccbf7be437a09c5f3bb9164db3af476d.1325571069.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Zhai Edwin Windows manager should be independent on session manager, especially when we have multiple session manager like mini-x and matchbox session. Signed-off-by: Zhai Edwin --- .../matchbox-wm/matchbox-wm_1.2.bb | 9 ++------- .../matchbox-wm/matchbox-wm_git.bb | 9 ++------- 2 files changed, 4 insertions(+), 14 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 84b966a..2628326 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" DESCRIPTION = "Matchbox window manager" LICENSE = "GPLv2.0+" DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR = "r4" +PR = "r5" SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://configure_fix.patch \ @@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match S = "${WORKDIR}/matchbox-window-manager-${PV}" -inherit autotools pkgconfig update-alternatives +inherit autotools pkgconfig FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ @@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \ ${datadir}/themes/Default/matchbox \ ${datadir}/themes/MBOpus/matchbox" -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - EXTRA_OECONF = " --enable-startup-notification \ --disable-xrm \ --enable-expat \ diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 5550dc2..ef9cf76 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3" PV = "1.2+git${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ file://configure_fix.patch;maxrev=1818 \ @@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ S = "${WORKDIR}/git" -inherit autotools pkgconfig update-alternatives - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" +inherit autotools pkgconfig FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \