metacity: do not require gdk-pixbuf-csource

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5241 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 28 insertions, 1 deletions

diff --git a/meta/packages/gnome/metacity/no-csource.patch b/meta/packages/gnome/metacity/no-csource.patch
new file mode 100644
index 0000000000..9359ada6dc
--- /dev/null
+++ b/meta/packages/gnome/metacity/no-csource.patch
@@ -0,0 +1,25 @@
+---
+ configure.in |    8 --------
+ 1 file changed, 8 deletions(-)
+
+--- metacity-2.22.0.orig/configure.in
++++ metacity-2.22.0/configure.in
+@@ -449,18 +449,10 @@ fi
+ AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") 
+ 
+ HOST_ALIAS=$host_alias
+ AC_SUBST(HOST_ALIAS)
+ 
+-AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+-
+-if test x"$GDK_PIXBUF_CSOURCE" = xno; then
+-  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
+-fi
+-
+-AC_SUBST(GDK_PIXBUF_CSOURCE)
+-
+ if test x$enable_gconf = xyes; then 
+    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+    if test x"$GCONFTOOL" = xno; then
+      AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+    fi
diff --git a/meta/packages/gnome/metacity_2.22.0.bb b/meta/packages/gnome/metacity_2.22.0.bb
index 9250d4a45f..ee95c6245d 100644
--- a/meta/packages/gnome/metacity_2.22.0.bb
+++ b/meta/packages/gnome/metacity_2.22.0.bb
@@ -2,10 +2,12 @@ SECTION = "x11/wm"
 DESCRIPTION = "Metacity is the boring window manager for the adult in you."
 LICENSE = "GPL"
 DEPENDS = "startup-notification gtk+ gconf"
-PR = "r1"
+PR = "r2"
 
 inherit gnome update-alternatives
 
+SRC_URI += "file://no-csource.patch;patch=1"
+
 ALTERNATIVE_NAME = "x-window-manager"
 ALTERNATIVE_LINK = "${bindir}/x-window-manager"
 ALTERNATIVE_PATH = "${bindir}/metacity"