diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-09 10:31:36 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-09 10:31:36 +0000 |
| commit | a42d7d3f663a20c4887481636eba0c84fd032e7a (patch) | |
| tree | 98fdc8efc1c5bd8ae488506fbba9bfce13d7bd8f /meta/packages/matchbox-wm | |
| parent | f0c6b03d5cd47370fd560e3fa737c4cbcace7de7 (diff) | |
| download | openembedded-core-a42d7d3f663a20c4887481636eba0c84fd032e7a.tar.gz openembedded-core-a42d7d3f663a20c4887481636eba0c84fd032e7a.tar.bz2 openembedded-core-a42d7d3f663a20c4887481636eba0c84fd032e7a.zip | |
matchbox-(wm/sato): moved creation of x-session-manager to matchbox-sato
matchbox-sato contain session start scripts which are used as
x-session-manager so it should register it with update-alternatives
instead of matchbox-wm
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4214 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/matchbox-wm')
| -rw-r--r-- | meta/packages/matchbox-wm/matchbox-wm_1.2.bb | 9 | ||||
| -rw-r--r-- | meta/packages/matchbox-wm/matchbox-wm_svn.bb | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb b/meta/packages/matchbox-wm/matchbox-wm_1.2.bb index 745493522f..f68eb2b4ae 100644 --- a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/meta/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -2,7 +2,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR="r3" +PR = "r4" SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://configure_fix.patch;patch=1 \ @@ -25,7 +25,12 @@ ALTERNATIVE_LINK = "${bindir}/x-session-manager" ALTERNATIVE_PATH = "${bindir}/matchbox-session" ALTERNATIVE_PRIORITY = "10" -EXTRA_OECONF = " --enable-startup-notification --disable-xrm --with-expat-lib=${STAGING_LIBDIR} --with-expat-includes=${STAGING_INCDIR}" +EXTRA_OECONF = " --enable-startup-notification \ + --disable-xrm \ + --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR}" + do_configure_prepend () { cp ${WORKDIR}/gconf-2.m4 ${S}/ diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb index fc1e09e503..d8a48e2ce6 100644 --- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" PV = "1.2+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ file://configure_fix.patch;patch=1;maxrev=1818 \ @@ -25,7 +25,11 @@ FILES_${PN} = "${bindir}/* \ ${datadir}/themes/Default/matchbox \ ${datadir}/themes/MBOpus/matchbox" -EXTRA_OECONF = " --enable-startup-notification --disable-xrm --with-expat-lib=${STAGING_LIBDIR} --with-expat-includes=${STAGING_INCDIR} --enable-expat" +EXTRA_OECONF = " --enable-startup-notification \ + --disable-xrm \ + --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR}" do_install_prepend() { install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig |