Patchwork metacity 2.30.3: fix build on GNOME-less hosts and fix packaging

login
register
mail settings
Submitter Koen Kooi
Date June 9, 2011, 10:54 a.m.
Message ID <1307616840-10973-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/5597/
State New, archived
Headers show

Comments

Koen Kooi - June 9, 2011, 10:54 a.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-gnome/gnome/metacity_2.30.3.bb |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
Richard Purdie - June 9, 2011, 2:53 p.m.
On Thu, 2011-06-09 at 12:54 +0200, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-gnome/gnome/metacity_2.30.3.bb |   13 ++++++++-----
>  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 18105f2..44e21c9 100644

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 18105f2..44e21c9 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 \
                     file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
 
 DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra"
-PR = "r0"
+PR = "r1"
 
 inherit gnome update-alternatives
 
 SRC_URI += "file://crosscompile.patch;patch=1"
+SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
+SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
 
 ALTERNATIVE_NAME = "x-window-manager"
 ALTERNATIVE_LINK = "${bindir}/x-window-manager"
@@ -19,11 +21,12 @@  ALTERNATIVE_PRIORITY = "10"
 EXTRA_OECONF += "--disable-verbose \
 	         --disable-xinerama"
 
-FILES_${PN} += "${datadir}/themes"
-
+do_configure_prepend() {
+	sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
+}
 export CC_FOR_BUILD = "${BUILD_CC}"
 export 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}"
 export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
 
-SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
-SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
+FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
+