summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/matchbox-sato/matchbox-sato_0.1.bb9
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_1.2.bb9
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_svn.bb8
3 files changed, 21 insertions, 5 deletions
diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
index e2f4aeb825..b8d6d7151a 100644
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -3,11 +3,18 @@ LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts" 4RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts"
5RCONFLICTS = "matchbox-common" 5RCONFLICTS = "matchbox-common"
6PR = "r20" 6PR = "r21"
7 7
8SRC_URI = "file://etc file://matchbox-session" 8SRC_URI = "file://etc file://matchbox-session"
9S = ${WORKDIR} 9S = ${WORKDIR}
10 10
11inherit update-alternatives
12
13ALTERNATIVE_NAME = "x-session-manager"
14ALTERNATIVE_LINK = "${bindir}/x-session-manager"
15ALTERNATIVE_PATH = "${bindir}/matchbox-session"
16ALTERNATIVE_PRIORITY = "10"
17
11do_install() { 18do_install() {
12 install -d ${D}/${bindir} 19 install -d ${D}/${bindir}
13 install -m 0755 ${S}/matchbox-session ${D}/${bindir} 20 install -m 0755 ${S}/matchbox-session ${D}/${bindir}
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"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
5PR="r3" 5PR = "r4"
6 6
7SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ 7SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
8 file://configure_fix.patch;patch=1 \ 8 file://configure_fix.patch;patch=1 \
@@ -25,7 +25,12 @@ ALTERNATIVE_LINK = "${bindir}/x-session-manager"
25ALTERNATIVE_PATH = "${bindir}/matchbox-session" 25ALTERNATIVE_PATH = "${bindir}/matchbox-session"
26ALTERNATIVE_PRIORITY = "10" 26ALTERNATIVE_PRIORITY = "10"
27 27
28EXTRA_OECONF = " --enable-startup-notification --disable-xrm --with-expat-lib=${STAGING_LIBDIR} --with-expat-includes=${STAGING_INCDIR}" 28EXTRA_OECONF = " --enable-startup-notification \
29 --disable-xrm \
30 --enable-expat \
31 --with-expat-lib=${STAGING_LIBDIR} \
32 --with-expat-includes=${STAGING_INCDIR}"
33
29 34
30do_configure_prepend () { 35do_configure_prepend () {
31 cp ${WORKDIR}/gconf-2.m4 ${S}/ 36 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"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
5PV = "1.2+svnr${SRCREV}" 5PV = "1.2+svnr${SRCREV}"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ 8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
9 file://configure_fix.patch;patch=1;maxrev=1818 \ 9 file://configure_fix.patch;patch=1;maxrev=1818 \
@@ -25,7 +25,11 @@ FILES_${PN} = "${bindir}/* \
25 ${datadir}/themes/Default/matchbox \ 25 ${datadir}/themes/Default/matchbox \
26 ${datadir}/themes/MBOpus/matchbox" 26 ${datadir}/themes/MBOpus/matchbox"
27 27
28EXTRA_OECONF = " --enable-startup-notification --disable-xrm --with-expat-lib=${STAGING_LIBDIR} --with-expat-includes=${STAGING_INCDIR} --enable-expat" 28EXTRA_OECONF = " --enable-startup-notification \
29 --disable-xrm \
30 --enable-expat \
31 --with-expat-lib=${STAGING_LIBDIR} \
32 --with-expat-includes=${STAGING_INCDIR}"
29 33
30do_install_prepend() { 34do_install_prepend() {
31 install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig 35 install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig