Patchwork [meta-gnome] metacity: add, from oe-core

login
register
mail settings
Submitter Ross Burton
Date Jan. 20, 2013, 8:03 p.m.
Message ID <1358712214-21396-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/42987/
State Accepted, archived
Commit 7eee72b05de181af1dd6cf6abc6b9d8528a77134
Headers show

Comments

Ross Burton - Jan. 20, 2013, 8:03 p.m.
Metacity, the GNOME 2 window manager.  Moved from oe-core as it's never used nor
tested there.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../metacity/remove-yelp-help-rules-var.patch      |   28 ++++++++++++++++++
 .../recipes-gnome/metacity/metacity_2.34.13.bb     |   30 ++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
Martin Jansa - Jan. 22, 2013, 12:27 p.m.
On Sun, Jan 20, 2013 at 08:03:34PM +0000, Ross Burton wrote:
> Metacity, the GNOME 2 window manager.  Moved from oe-core as it's never used nor
> tested there.

Merged, thanks

> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../metacity/remove-yelp-help-rules-var.patch      |   28 ++++++++++++++++++
>  .../recipes-gnome/metacity/metacity_2.34.13.bb     |   30 ++++++++++++++++++++
>  2 files changed, 58 insertions(+)
>  create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
>  create mode 100644 meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
> 
> diff --git a/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
> new file mode 100644
> index 0000000..1970e9a
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
> @@ -0,0 +1,28 @@
> +Remove unused variable (YELP_HELP_RULES)
> +
> +Upstream-Status: Pending
> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> +
> +Index: metacity-2.34.13/doc/creating_themes/Makefile.am
> +===================================================================
> +--- metacity-2.34.13.orig/doc/creating_themes/Makefile.am
> ++++ metacity-2.34.13/doc/creating_themes/Makefile.am
> +@@ -1,6 +1,5 @@
> + ### This part of Makefile.am can be customized by you.
> + 
> +-@YELP_HELP_RULES@
> + 
> + # The name of the directory in /usr/share/gnome/help/, 
> + # and the name of the main .xml file:
> +Index: metacity-2.34.13/doc/creating_themes/Makefile.in
> +===================================================================
> +--- metacity-2.34.13.orig/doc/creating_themes/Makefile.in
> ++++ metacity-2.34.13/doc/creating_themes/Makefile.in
> +@@ -455,7 +455,6 @@ uninstall-am:
> + 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
> + 
> + 
> +-@YELP_HELP_RULES@
> + 
> + # Tell versions [3.59,3.63) of GNU make to not export all variables.
> + # Otherwise a system limit (for SysV at least) may be exceeded.
> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
> new file mode 100644
> index 0000000..3605201
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
> @@ -0,0 +1,30 @@
> +SECTION = "x11/wm"
> +DESCRIPTION = "Metacity is the boring window manager for the adult in you."
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> +                    file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
> +
> +DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
> +PR = "r0"
> +
> +inherit gnome update-alternatives
> +
> +GNOME_COMPRESS_TYPE = "xz"
> +
> +SRC_URI += "file://remove-yelp-help-rules-var.patch"
> +SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
> +SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
> +
> +ALTERNATIVE_${PN} = "x-window-manager"
> +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
> +ALTERNATIVE_PRIORITY = "10"
> +
> +EXTRA_OECONF += "--disable-verbose \
> +	         --disable-xinerama"
> +
> +do_configure_prepend() {
> +	sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
> +}
> +
> +FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
> +
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
new file mode 100644
index 0000000..1970e9a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
@@ -0,0 +1,28 @@ 
+Remove unused variable (YELP_HELP_RULES)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: metacity-2.34.13/doc/creating_themes/Makefile.am
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.am
++++ metacity-2.34.13/doc/creating_themes/Makefile.am
+@@ -1,6 +1,5 @@
+ ### This part of Makefile.am can be customized by you.
+ 
+-@YELP_HELP_RULES@
+ 
+ # The name of the directory in /usr/share/gnome/help/, 
+ # and the name of the main .xml file:
+Index: metacity-2.34.13/doc/creating_themes/Makefile.in
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.in
++++ metacity-2.34.13/doc/creating_themes/Makefile.in
+@@ -455,7 +455,6 @@ uninstall-am:
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+-@YELP_HELP_RULES@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
new file mode 100644
index 0000000..3605201
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
@@ -0,0 +1,30 @@ 
+SECTION = "x11/wm"
+DESCRIPTION = "Metacity is the boring window manager for the adult in you."
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
+
+DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
+PR = "r0"
+
+inherit gnome update-alternatives
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += "file://remove-yelp-help-rules-var.patch"
+SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
+SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
+
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
+ALTERNATIVE_PRIORITY = "10"
+
+EXTRA_OECONF += "--disable-verbose \
+	         --disable-xinerama"
+
+do_configure_prepend() {
+	sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
+