diff options
author | Ross Burton <ross.burton@intel.com> | 2013-01-29 11:05:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-01 15:54:03 +0000 |
commit | bbc374a69bf5bfc56091859e143d03541d3d8661 (patch) | |
tree | 0cddac060830dabe3ab45e8f4cb4fd06f7d55066 /meta | |
parent | f938ef0a8e89b0a7a854978b267ba6ac9a901c2e (diff) | |
download | poky-bbc374a69bf5bfc56091859e143d03541d3d8661.tar.gz |
metacity: remove, migrated to meta-gnome
(From OE-Core rev: 30b4dcdd3a4f78f3e7c7b94ffb9e0f94e56568ad)
(From OE-Core rev: d5314f90747a09967fcbcccec8d86b1e2f48980d)
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/remove-yelp-help-rules-var.patch | 28 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/metacity_2.34.13.bb | 30 |
2 files changed, 0 insertions, 58 deletions
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 deleted file mode 100644 index 1970e9afb1..0000000000 --- a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Remove unused variable (YELP_HELP_RULES) | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
5 | |||
6 | Index: 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: | ||
17 | Index: 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.34.13.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb deleted file mode 100644 index 360520152b..0000000000 --- a/meta/recipes-gnome/gnome/metacity_2.34.13.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SECTION = "x11/wm" | ||
2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
5 | file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" | ||
6 | |||
7 | DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils" | ||
8 | PR = "r0" | ||
9 | |||
10 | inherit gnome update-alternatives | ||
11 | |||
12 | GNOME_COMPRESS_TYPE = "xz" | ||
13 | |||
14 | SRC_URI += "file://remove-yelp-help-rules-var.patch" | ||
15 | SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6" | ||
16 | SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075" | ||
17 | |||
18 | ALTERNATIVE_${PN} = "x-window-manager" | ||
19 | ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity" | ||
20 | ALTERNATIVE_PRIORITY = "10" | ||
21 | |||
22 | EXTRA_OECONF += "--disable-verbose \ | ||
23 | --disable-xinerama" | ||
24 | |||
25 | do_configure_prepend() { | ||
26 | sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in | ||
27 | } | ||
28 | |||
29 | FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" | ||
30 | |||