From b2a619b79eff718317bec201a37ea5f6f92f6d46 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 22 Apr 2009 17:36:22 +0100
Subject: metacity-clutter: Rename to mutter and point at the new upstream

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../gnome/metacity-clutter/crosscompile.patch      | 55 ----------------------
 .../gnome/metacity-clutter/fix_pkgconfig.patch     | 10 ----
 meta/packages/gnome/metacity-clutter/nodocs.patch  | 29 ------------
 3 files changed, 94 deletions(-)
 delete mode 100644 meta/packages/gnome/metacity-clutter/crosscompile.patch
 delete mode 100644 meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch
 delete mode 100644 meta/packages/gnome/metacity-clutter/nodocs.patch

(limited to 'meta/packages/gnome/metacity-clutter')

diff --git a/meta/packages/gnome/metacity-clutter/crosscompile.patch b/meta/packages/gnome/metacity-clutter/crosscompile.patch
deleted file mode 100644
index b27383b09..000000000
--- a/meta/packages/gnome/metacity-clutter/crosscompile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: git/configure.in
-===================================================================
---- git.orig/configure.in	2009-01-27 14:49:10.000000000 +0000
-+++ git/configure.in	2009-01-27 15:29:41.000000000 +0000
-@@ -46,6 +46,32 @@
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
- 
-+if test x"$CC_FOR_BUILD" = x; then
-+	if test x"$cross_compiling" = xyes; then
-+	       AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+	else
-+	       CC_FOR_BUILD="$CC"
-+	fi
-+fi
-+AC_SUBST([CC_FOR_BUILD])
-+if test x"$CFLAGS_FOR_BUILD" = x; then
-+	if test x"$cross_compiling" = xyes; then
-+	       AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc)
-+	else
-+	       CFLAGS_FOR_BUILD="$CFLAGS"
-+	fi
-+fi
-+AC_SUBST([CFLAGS_FOR_BUILD])
-+if test x"$LDFLAGS_FOR_BUILD" = x; then
-+	if test x"$cross_compiling" = xyes; then
-+	       AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc)
-+	else
-+	       LDFLAGS_FOR_BUILD="$LDFLAGS"
-+	fi
-+fi
-+AC_SUBST([LDFLAGS_FOR_BUILD])
-+
-+
- #### Integer sizes
- 
- AC_CHECK_SIZEOF(char)
-Index: git/src/Makefile.am
-===================================================================
---- git.orig/src/Makefile.am	2009-01-27 15:25:31.000000000 +0000
-+++ git/src/Makefile.am	2009-01-27 15:39:54.000000000 +0000
-@@ -168,11 +168,9 @@
- metacity_dialog_SOURCES= 	\
- 	ui/metacity-dialog.c
- 
--schema_bindings_SOURCES =       \
--        core/schema-bindings.c			\
--	metacity.schemas.in.in
-+schema_bindings:
-+	@CC_FOR_BUILD@ core/schema-bindings.c -I./include -I ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
- 
--schema_bindings_LDADD = @METACITY_LIBS@
- metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
- 	@echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
- 	${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
diff --git a/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch b/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch
deleted file mode 100644
index 3714383bc..000000000
--- a/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: git/src/metacity-plugins.pc.in
-===================================================================
---- git.orig/src/metacity-plugins.pc.in	2008-12-17 22:42:19.000000000 +0000
-+++ git/src/metacity-plugins.pc.in	2008-12-17 22:42:25.000000000 +0000
-@@ -14,4 +14,4 @@
- Requires: @CLUTTER_PACKAGE@
- Version: @VERSION@
- Libs: @CLUTTER_LIBS@
--Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\"
-+Cflags: -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\"
diff --git a/meta/packages/gnome/metacity-clutter/nodocs.patch b/meta/packages/gnome/metacity-clutter/nodocs.patch
deleted file mode 100644
index 98f43be5e..000000000
--- a/meta/packages/gnome/metacity-clutter/nodocs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am	2009-01-27 13:26:12.000000000 +0000
-+++ git/Makefile.am	2009-01-27 14:07:13.000000000 +0000
-@@ -1,5 +1,5 @@
- 
--SUBDIRS=src po doc
-+SUBDIRS=src po
- 
- EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
- 	intltool-extract.in intltool-merge.in intltool-update.in
-Index: git/configure.in
-===================================================================
---- git.orig/configure.in	2009-01-27 13:26:12.000000000 +0000
-+++ git/configure.in	2009-01-27 14:11:16.000000000 +0000
-@@ -538,12 +538,9 @@
- 
- # Warnings are there for a reason
- if test "x$GCC" = "xyes"; then
--  CFLAGS="$CFLAGS -Wall -Werror -ansi"
-+  CFLAGS="$CFLAGS -Wall -ansi"
- fi
- 
--# Use gnome-doc-utils:
--GNOME_DOC_INIT([0.8.0])
--
- AC_CONFIG_FILES([
- Makefile
- doc/Makefile
-- 
cgit v1.2.3