summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-12-30 21:04:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-06 10:06:26 +0000
commit1afd9d9b580b7023aae38b0ca8158b064be75e97 (patch)
treeb10998ffca71f2a0fe8e58d6fcccc1764eb13bd9 /meta/recipes-gnome/gnome
parentfbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12 (diff)
downloadpoky-1afd9d9b580b7023aae38b0ca8158b064be75e97.tar.gz
metacity: Upgrade to 2.30.3
Revised one patch from openembed to make host native binary for build. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r--meta/recipes-gnome/gnome/metacity/crosscompile.patch60
-rw-r--r--meta/recipes-gnome/gnome/metacity_2.30.3.bb (renamed from meta/recipes-gnome/gnome/metacity_2.22.0.bb)14
2 files changed, 70 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
new file mode 100644
index 0000000000..8d86134fae
--- /dev/null
+++ b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
@@ -0,0 +1,60 @@
1This patch is revised version from openembed. It build host native binary
2rather than target binary in cross-compile environment.
3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5
6Index: metacity-2.30.3/src/Makefile.am
7===================================================================
8--- metacity-2.30.3.orig/src/Makefile.am 2010-09-05 00:09:52.000000000 +0800
9+++ metacity-2.30.3/src/Makefile.am 2010-12-31 11:15:31.000000000 +0800
10@@ -134,11 +134,9 @@
11 metacity_theme_viewer_SOURCES= \
12 ui/theme-viewer.c
13
14-schema_bindings_SOURCES = \
15- core/schema-bindings.c \
16- metacity.schemas.in.in
17+schema_bindings:
18+ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
19
20-schema_bindings_LDADD = @METACITY_LIBS@
21 metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
22 @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
23 ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
24Index: metacity-2.30.3/configure.in
25===================================================================
26--- metacity-2.30.3.orig/configure.in 2010-09-22 22:14:06.000000000 +0800
27+++ metacity-2.30.3/configure.in 2010-12-31 11:15:31.000000000 +0800
28@@ -31,6 +31,32 @@
29 AC_LIBTOOL_WIN32_DLL
30 AM_PROG_LIBTOOL
31
32+if test x"$CC_FOR_BUILD" = x; then
33+ if test x"$cross_compiling" = xyes; then
34+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
35+ else
36+ CC_FOR_BUILD="$CC"
37+ fi
38+fi
39+AC_SUBST([CC_FOR_BUILD])
40+if test x"$CFLAGS_FOR_BUILD" = x; then
41+ if test x"$cross_compiling" = xyes; then
42+ echo boo!
43+ else
44+ CFLAGS_FOR_BUILD="$CFLAGS"
45+ fi
46+fi
47+AC_SUBST([CFLAGS_FOR_BUILD])
48+if test x"$LDFLAGS_FOR_BUILD" = x; then
49+ if test x"$cross_compiling" = xyes; then
50+ echo boo!
51+ else
52+ LDFLAGS_FOR_BUILD="$LDFLAGS"
53+ fi
54+fi
55+AC_SUBST([LDFLAGS_FOR_BUILD])
56+
57+
58 #### Integer sizes
59
60 AC_CHECK_SIZEOF(char)
diff --git a/meta/recipes-gnome/gnome/metacity_2.22.0.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index e698ec439d..6e9dd7257c 100644
--- a/meta/recipes-gnome/gnome/metacity_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -4,11 +4,13 @@ LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 4LIC_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-csource-native" 7DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-csource-native libcanberra"
8PR = "r3" 8PR = "r0"
9 9
10inherit gnome update-alternatives 10inherit gnome update-alternatives
11 11
12SRC_URI += "file://crosscompile.patch;patch=1"
13
12ALTERNATIVE_NAME = "x-window-manager" 14ALTERNATIVE_NAME = "x-window-manager"
13ALTERNATIVE_LINK = "${bindir}/x-window-manager" 15ALTERNATIVE_LINK = "${bindir}/x-window-manager"
14ALTERNATIVE_PATH = "${bindir}/metacity" 16ALTERNATIVE_PATH = "${bindir}/metacity"
@@ -19,5 +21,9 @@ EXTRA_OECONF += "--disable-verbose \
19 21
20FILES_${PN} += "${datadir}/themes" 22FILES_${PN} += "${datadir}/themes"
21 23
22SRC_URI[archive.md5sum] = "8cb6d02cf66a1003532b4f5d2754d696" 24export CC_FOR_BUILD = "${BUILD_CC}"
23SRC_URI[archive.sha256sum] = "3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf" 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}"
26export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
27
28SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
29SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"