Skip to contentSkip to conversation

matchbox-wm: remove x-session-manager handling

PATCH Applied [email protected] 2 participants 3 messages Jan 5, 2012 – Jan 6, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover matchbox-wm: remove x-session-manager handling

From: Zhai Edwin <[email protected]>

This is V2 version that made clear commit mesg and adjust alternative priority to make mini-x has high priority over matchbox-session according to Saul's suggestion.

Thanks,
Edwin

The following changes since commit 021848be9eeb71de8acfba6c66c11645b01523b8:

valgrind: Fix for automake update (2012-01-04 16:04:08 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (1):
matchbox-wm: Remove x-session-manager handling

 .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
 .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
 .../mini-x-session/mini-x-session_0.1.bb           |    2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)
author
#1 lore raw

PATCH 1/1 matchbox-wm: Remove x-session-manager handling

From: Zhai Edwin <[email protected]>

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.

Signed-off-by Zhai Edwin <[email protected]>
---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
 .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
 .../mini-x-session/mini-x-session_0.1.bb           |    2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +2 -7
index 84b966a..2628326 100644
@@ -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 \
meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +2 -7
index 5550dc2..ef9cf76 100644
@@ -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 \
meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +1 -1
index 3818d16..9818650 100644
@@ -16,7 +16,7 @@ inherit update-alternatives
 ALTERNATIVE_NAME = "x-session-manager"
 ALTERNATIVE_LINK = "${bindir}/x-session-manager"
 ALTERNATIVE_PATH = "${bindir}/mini-x-session"
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_PRIORITY = "50"
 
 do_install() {
 	install -d ${D}/${bindir}
Signature · 1 line
1.7.1
Applied
#2 lore raw
In reply to [email protected]
Quoted 27 lines · On 01/04/2012 09:57 PM, [email protected] wrote:

From: Zhai Edwin<[email protected]>

This is V2 version that made clear commit mesg and adjust alternative priority to make mini-x has high priority over matchbox-session according to Saul's suggestion.

Thanks,
Edwin

The following changes since commit 021848be9eeb71de8acfba6c66c11645b01523b8:

valgrind: Fix for automake update (2012-01-04 16:04:08 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (1):
matchbox-wm: Remove x-session-manager handling

  .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
  .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
  .../mini-x-session/mini-x-session_0.1.bb           |    2 +-
  3 files changed, 5 insertions(+), 15 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!