[PATCH 0/2] Remove metacity and libcanberra

[PATCH 0/2] Remove metacity and libcanberra

[Ross Burton]

Hi,

Metacity is the GNOME 2 window manager, so unused and untested in oe-core.  It's
now been moved to meta-gnome so remove it from oe-core.

libcanberra was in oe-core solely for metacity, so that's also been moved to
meta-gnome so remove it from oe-core.

Ross

The following changes since commit b2869b6810728a5f003ddad335fd7f6512181a57:

  ref-manual: Added a general reference and link to kernel-dev (2013-01-27 13:56:06 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/removes

for you to fetch changes up to 1f1304ac51438de46cd47c0fdeb9f7471c77f016:

  metacity: remove, migrated to meta-gnome (2013-01-29 11:05:31 +0000)

----------------------------------------------------------------
Ross Burton (2):
      libcanberra: remove, migrated to meta-gnome
      metacity: remove, migrated to meta-gnome

 .../metacity/remove-yelp-help-rules-var.patch      |   28 -----------------
 meta/recipes-gnome/gnome/metacity_2.34.13.bb       |   30 ------------------
 .../pulseaudio/libcanberra_0.29.bb                 |   32 --------------------
 3 files changed, 90 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
 delete mode 100644 meta/recipes-gnome/gnome/metacity_2.34.13.bb
 delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb

Ross Burton (2):
  libcanberra: remove, migrated to meta-gnome
  metacity: remove, migrated to meta-gnome

 .../metacity/remove-yelp-help-rules-var.patch      |   28 -----------------
 meta/recipes-gnome/gnome/metacity_2.34.13.bb       |   30 ------------------
 .../pulseaudio/libcanberra_0.29.bb                 |   32 --------------------
 3 files changed, 90 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
 delete mode 100644 meta/recipes-gnome/gnome/metacity_2.34.13.bb
 delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb

-- 
1.7.10.4

[PATCH 1/2] libcanberra: remove, migrated to meta-gnome

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../pulseaudio/libcanberra_0.29.bb                 |   32 --------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb

diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb
deleted file mode 100644
index b3c0e3d..0000000
--- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Implementation of XDG Sound Theme and Name Specifications"
-DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03"
-
-DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis"
-PR = "r0"
-
-inherit gconf autotools
-
-SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
-SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
-
-EXTRA_OECONF = " --disable-oss --disable-ltdl-install" 
-
-do_configure_prepend () {
-	rm -f ${S}/libltdl/configure*
-}
-
-PACKAGES += "${PN}-gnome"
-
-FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
-FILES_${PN}-gnome += "${datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \
-	              ${libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop"
-FILES_${PN}-dev += "${libdir}/libcanberra-0.29/libcanberra-*.so \
-		    ${libdir}/libcanberra-0.29/libcanberra-*.la \
-		    ${datadir}/vala/vapi"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.29/.debug"
-
-- 
1.7.10.4

[PATCH 2/2] metacity: remove, migrated to meta-gnome

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../metacity/remove-yelp-help-rules-var.patch      |   28 ------------------
 meta/recipes-gnome/gnome/metacity_2.34.13.bb       |   30 --------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
 delete mode 100644 meta/recipes-gnome/gnome/metacity_2.34.13.bb

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 1970e9a..0000000
--- a/meta/recipes-gnome/gnome/metacity/remove-yelp-help-rules-var.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/recipes-gnome/gnome/metacity_2.34.13.bb b/meta/recipes-gnome/gnome/metacity_2.34.13.bb
deleted file mode 100644
index 3605201..0000000
--- a/meta/recipes-gnome/gnome/metacity_2.34.13.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-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