summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/metacity_2.30.3.bb
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-09 12:54:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 15:51:37 +0100
commit43d84e6febb2bfe17be4fedf5679ab8904249318 (patch)
tree979748d87cea12fd37c8c5abb5615fc40eb71e9f /meta/recipes-gnome/gnome/metacity_2.30.3.bb
parentb0c29c253d88cc6c63d0e10f6f5a1f2914a1da30 (diff)
downloadpoky-43d84e6febb2bfe17be4fedf5679ab8904249318.tar.gz
metacity 2.30.3: fix build on GNOME-less hosts and fix packaging
(From OE-Core rev: 919956bf3114a4af5177d30a0c4ea4907e930439) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/metacity_2.30.3.bb')
-rw-r--r--meta/recipes-gnome/gnome/metacity_2.30.3.bb13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 18105f2d6f..44e21c9c6b 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
5 file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" 5 file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
6 6
7DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra" 7DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra"
8PR = "r0" 8PR = "r1"
9 9
10inherit gnome update-alternatives 10inherit gnome update-alternatives
11 11
12SRC_URI += "file://crosscompile.patch;patch=1" 12SRC_URI += "file://crosscompile.patch;patch=1"
13SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
14SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
13 15
14ALTERNATIVE_NAME = "x-window-manager" 16ALTERNATIVE_NAME = "x-window-manager"
15ALTERNATIVE_LINK = "${bindir}/x-window-manager" 17ALTERNATIVE_LINK = "${bindir}/x-window-manager"
@@ -19,11 +21,12 @@ ALTERNATIVE_PRIORITY = "10"
19EXTRA_OECONF += "--disable-verbose \ 21EXTRA_OECONF += "--disable-verbose \
20 --disable-xinerama" 22 --disable-xinerama"
21 23
22FILES_${PN} += "${datadir}/themes" 24do_configure_prepend() {
23 25 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
26}
24export CC_FOR_BUILD = "${BUILD_CC}" 27export CC_FOR_BUILD = "${BUILD_CC}"
25export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}" 28export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}"
26export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0" 29export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
27 30
28SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339" 31FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
29SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd" 32