summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 10:43:05 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 10:43:05 +0000
commitf73c7d9cf6007281b87d7b2cdbcd87b79518b1c8 (patch)
tree8c3c695294201825939bcbf9ff7fe95a29c3342f
parentb6b03ef9f394c58635afd66a51c131a2048782ed (diff)
downloadpoky-f73c7d9cf6007281b87d7b2cdbcd87b79518b1c8.tar.gz
matchbox: Quoting fixes, s#libx11#virtual/libx11# from OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@911 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/matchbox-desktop/matchbox-desktop_svn.bb4
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb4
-rw-r--r--meta/packages/matchbox-panel/matchbox-panel.inc6
-rw-r--r--meta/packages/matchbox-panel/matchbox-panel_svn.bb2
-rw-r--r--meta/packages/matchbox-stroke/matchbox-stroke_svn.bb2
-rw-r--r--meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb2
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb2
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_1.1.bb2
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_svn.bb2
9 files changed, 14 insertions, 12 deletions
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 3d041bfe21..8e89d9b9ff 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -9,7 +9,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
9 9
10EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" 10EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
11 11
12S = ${WORKDIR}/${PN} 12S = "${WORKDIR}/${PN}"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
@@ -22,7 +22,7 @@ FILES_${PN} = "${bindir}/* \
22 22
23FILES_${PN}-dev += "${libdir}/matchbox-desktop \ 23FILES_${PN}-dev += "${libdir}/matchbox-desktop \
24 ${includedir}/matchbox-desktop \ 24 ${includedir}/matchbox-desktop \
25 ${libdir}/matchbox/desktop/*.*a \ 25 ${libdir}/matchbox/desktop/*.*a \
26 ${datadir}/matchbox/desktop/modules/*a" 26 ${datadir}/matchbox/desktop/modules/*a"
27 27
28FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/" 28FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index e561e846af..4cea81a2ea 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "Matchbox virtual keyboard for X11"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libfakekey expat libxft" 3DEPENDS = "libfakekey expat libxft"
4SECTION = "x11" 4SECTION = "x11"
5MAINTAINER = "Koen Kooi <koen@handhelds.org>"
6PV = "0.0+svn${SRCDATE}" 5PV = "0.0+svn${SRCDATE}"
7PR="r2" 6PR="r2"
8 7
9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
10 9
11 10
12S = ${WORKDIR}/${PN} 11S = "${WORKDIR}/${PN}"
13 12
14inherit autotools pkgconfig gettext 13inherit autotools pkgconfig gettext
15 14
@@ -19,4 +18,3 @@ FILES_${PN} = "${bindir}/* \
19 ${datadir}/applications \ 18 ${datadir}/applications \
20 ${datadir}/pixmaps \ 19 ${datadir}/pixmaps \
21 ${datadir}/matchbox-keyboard" 20 ${datadir}/matchbox-keyboard"
22
diff --git a/meta/packages/matchbox-panel/matchbox-panel.inc b/meta/packages/matchbox-panel/matchbox-panel.inc
index 26f15437ad..44bbae6870 100644
--- a/meta/packages/matchbox-panel/matchbox-panel.inc
+++ b/meta/packages/matchbox-panel/matchbox-panel.inc
@@ -1,8 +1,10 @@
1DESCRIPTION = "Matchbox Window Manager Panel" 1DESCRIPTION = "Matchbox Window Manager Panel"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools" 3DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
4SECTION = "x11/wm" 4SECTION = "x11/wm"
5 5
6PR = "r1"
7
6inherit autotools pkgconfig gettext 8inherit autotools pkgconfig gettext
7 9
8CFLAGS += "-D_GNU_SOURCE" 10CFLAGS += "-D_GNU_SOURCE"
@@ -11,10 +13,12 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
11EXTRA_OECONF_append_h3600 = " --enable-small-icons " 13EXTRA_OECONF_append_h3600 = " --enable-small-icons "
12EXTRA_OECONF_append_h3900 = " --enable-small-icons " 14EXTRA_OECONF_append_h3900 = " --enable-small-icons "
13EXTRA_OECONF_append_h2200 = " --enable-small-icons " 15EXTRA_OECONF_append_h2200 = " --enable-small-icons "
16EXTRA_OECONF_append_h4000 = " --enable-small-icons "
14EXTRA_OECONF_append_collie = " --enable-small-icons " 17EXTRA_OECONF_append_collie = " --enable-small-icons "
15EXTRA_OECONF_append_poodle = " --enable-small-icons " 18EXTRA_OECONF_append_poodle = " --enable-small-icons "
16EXTRA_OECONF_append_mnci = " --enable-small-icons " 19EXTRA_OECONF_append_mnci = " --enable-small-icons "
17EXTRA_OECONF_append_integral13 = " --enable-small-icons " 20EXTRA_OECONF_append_integral13 = " --enable-small-icons "
21PACKAGE_ARCH = "${MACHINE}"
18 22
19FILES_${PN} = "${bindir}/* \ 23FILES_${PN} = "${bindir}/* \
20 ${datadir}/applications \ 24 ${datadir}/applications \
diff --git a/meta/packages/matchbox-panel/matchbox-panel_svn.bb b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
index a279954fe2..e42d505a30 100644
--- a/meta/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -6,6 +6,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
6 6
7EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" 7EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
8 8
9S = ${WORKDIR}/${PN} 9S = "${WORKDIR}/${PN}"
10 10
11 11
diff --git a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
index a019c16ca6..6e003c787c 100644
--- a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -8,7 +8,7 @@ PR="r1"
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
9 9
10 10
11S = ${WORKDIR}/${PN} 11S = "${WORKDIR}/${PN}"
12 12
13inherit autotools pkgconfig gettext 13inherit autotools pkgconfig gettext
14 14
diff --git a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index ac00978c41..fb91f03b12 100644
--- a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -11,7 +11,7 @@ inherit autotools pkgconfig
11# split into several packages plus one meta package 11# split into several packages plus one meta package
12PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal" 12PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
13 13
14ALLOW_EMPTY_${PN} = 1 14ALLOW_EMPTY_${PN} = "1"
15FILES_${PN} = "" 15FILES_${PN} = ""
16RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal" 16RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
17 17
diff --git a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index cc21edebd8..1a1a89ec7a 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
1SECTION = "x11/wm" 1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
5RDEPENDS = "matchbox-common" 5RDEPENDS = "matchbox-common"
6PR="r0" 6PR="r0"
7 7
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
index 2d7c575c03..27298b06f2 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -1,7 +1,7 @@
1SECTION = "x11/wm" 1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common"
5RDEPENDS = "matchbox-common" 5RDEPENDS = "matchbox-common"
6PR="r2" 6PR="r2"
7 7
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
index 262a3b98d4..4f58c46a73 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
1SECTION = "x11/wm" 1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat matchbox-common gconf"
5RDEPENDS = "matchbox-common" 5RDEPENDS = "matchbox-common"
6PV = "0.9.5+svn${SRCDATE}" 6PV = "0.9.5+svn${SRCDATE}"
7PR = "r4" 7PR = "r4"