summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 15:10:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:23 +0000
commit645ccbb0b76a28456375689e1ac3de0734720894 (patch)
tree22d1c12124aa1f983a222af72810d6beda136d35 /meta
parent996be05cdcaf05ff83b7db7718fb4012afe794e9 (diff)
downloadpoky-645ccbb0b76a28456375689e1ac3de0734720894.tar.gz
metacity: upgrade to 2.34.13
crosscompile.patch: removed - schema_bindings binary not generated anymore remove-yelp-help-rules-var.patch: added - YELP_HELP_RULES var is not used [Other changes] - the 2.34.13 version requires the gsettings-desktop-schemas (add it to DEPENDS) (From OE-Core rev: 3c6262dd270a7c2f709c84335501b345f2b47d38) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/metacity/crosscompile.patch62
-rw-r--r--meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch28
-rw-r--r--meta/recipes-gnome/gnome/metacity_2.34.13.bb (renamed from meta/recipes-gnome/gnome/metacity_2.30.3.bb)14
3 files changed, 35 insertions, 69 deletions
diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
deleted file mode 100644
index 7a1942ab26..0000000000
--- a/meta/recipes-gnome/gnome/metacity/crosscompile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
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
6Upstream-Status: Inappropriate [embedded specific]
7
8Index: metacity-2.30.3/src/Makefile.am
9===================================================================
10--- metacity-2.30.3.orig/src/Makefile.am 2010-09-05 00:09:52.000000000 +0800
11+++ metacity-2.30.3/src/Makefile.am 2010-12-31 11:15:31.000000000 +0800
12@@ -134,11 +134,9 @@
13 metacity_theme_viewer_SOURCES= \
14 ui/theme-viewer.c
15
16-schema_bindings_SOURCES = \
17- core/schema-bindings.c \
18- metacity.schemas.in.in
19+schema_bindings:
20+ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
21
22-schema_bindings_LDADD = @METACITY_LIBS@
23 metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
24 @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
25 ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
26Index: metacity-2.30.3/configure.in
27===================================================================
28--- metacity-2.30.3.orig/configure.in 2010-09-22 22:14:06.000000000 +0800
29+++ metacity-2.30.3/configure.in 2010-12-31 11:15:31.000000000 +0800
30@@ -31,6 +31,32 @@
31 AC_LIBTOOL_WIN32_DLL
32 AM_PROG_LIBTOOL
33
34+if test x"$CC_FOR_BUILD" = x; then
35+ if test x"$cross_compiling" = xyes; then
36+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
37+ else
38+ CC_FOR_BUILD="$CC"
39+ fi
40+fi
41+AC_SUBST([CC_FOR_BUILD])
42+if test x"$CFLAGS_FOR_BUILD" = x; then
43+ if test x"$cross_compiling" = xyes; then
44+ echo boo!
45+ else
46+ CFLAGS_FOR_BUILD="$CFLAGS"
47+ fi
48+fi
49+AC_SUBST([CFLAGS_FOR_BUILD])
50+if test x"$LDFLAGS_FOR_BUILD" = x; then
51+ if test x"$cross_compiling" = xyes; then
52+ echo boo!
53+ else
54+ LDFLAGS_FOR_BUILD="$LDFLAGS"
55+ fi
56+fi
57+AC_SUBST([LDFLAGS_FOR_BUILD])
58+
59+
60 #### Integer sizes
61
62 AC_CHECK_SIZEOF(char)
diff --git a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
new file mode 100644
index 0000000000..1970e9afb1
--- /dev/null
+++ b/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
@@ -0,0 +1,28 @@
1Remove unused variable (YELP_HELP_RULES)
2
3Upstream-Status: Pending
4Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
5
6Index: metacity-2.34.13/doc/creating_themes/Makefile.am
7===================================================================
8--- metacity-2.34.13.orig/doc/creating_themes/Makefile.am
9+++ metacity-2.34.13/doc/creating_themes/Makefile.am
10@@ -1,6 +1,5 @@
11 ### This part of Makefile.am can be customized by you.
12
13-@YELP_HELP_RULES@
14
15 # The name of the directory in /usr/share/gnome/help/,
16 # and the name of the main .xml file:
17Index: metacity-2.34.13/doc/creating_themes/Makefile.in
18===================================================================
19--- metacity-2.34.13.orig/doc/creating_themes/Makefile.in
20+++ metacity-2.34.13/doc/creating_themes/Makefile.in
21@@ -455,7 +455,6 @@ uninstall-am:
22 mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
23
24
25-@YELP_HELP_RULES@
26
27 # Tell versions [3.59,3.63) of GNU make to not export all variables.
28 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
index 5b996d2297..360520152b 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
@@ -4,14 +4,16 @@ 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-native libcanberra gnome-doc-utils" 7DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
8PR = "r5" 8PR = "r0"
9 9
10inherit gnome update-alternatives 10inherit gnome update-alternatives
11 11
12SRC_URI += "file://crosscompile.patch" 12GNOME_COMPRESS_TYPE = "xz"
13SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339" 13
14SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd" 14SRC_URI += "file://remove-yelp-help-rules-var.patch"
15SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
16SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
15 17
16ALTERNATIVE_${PN} = "x-window-manager" 18ALTERNATIVE_${PN} = "x-window-manager"
17ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity" 19ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
@@ -23,8 +25,6 @@ EXTRA_OECONF += "--disable-verbose \
23do_configure_prepend() { 25do_configure_prepend() {
24 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in 26 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
25} 27}
26CFLAGS_FOR_BUILD += "-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}"
27LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
28 28
29FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" 29FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
30 30