rpms/empathy/devel clutter.patch,NONE,1.1

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9469

Added Files:
	clutter.patch 
Log Message:
add patch


clutter.patch:
 configure              |   16 ++++++++--------
 configure.ac           |    2 +-
 src/empathy-map-view.c |    4 ++--
 src/empathy.c          |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE clutter.patch ---
diff -up empathy-2.27.5/configure.ac.clutter empathy-2.27.5/configure.ac
--- empathy-2.27.5/configure.ac.clutter	2009-07-29 07:36:07.000000000 -0400
+++ empathy-2.27.5/configure.ac	2009-08-03 23:00:02.414627609 -0400
@@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then
    [
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
diff -up empathy-2.27.5/configure.clutter empathy-2.27.5/configure
--- empathy-2.27.5/configure.clutter	2009-07-29 07:37:16.000000000 -0400
+++ empathy-2.27.5/configure	2009-08-03 23:00:02.426622014 -0400
@@ -18518,12 +18518,12 @@ if test -n "$PKG_CONFIG"; then
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
       champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18531,7 +18531,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18548,12 +18548,12 @@ if test -n "$PKG_CONFIG"; then
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
       champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18561,7 +18561,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18584,13 +18584,13 @@ fi
 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    "`
         else
 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    "`
         fi
 	# Put the nasty error message in config.log where it belongs
diff -up empathy-2.27.5/src/empathy.c.clutter empathy-2.27.5/src/empathy.c
--- empathy-2.27.5/src/empathy.c.clutter	2009-08-03 23:15:04.865374891 -0400
+++ empathy-2.27.5/src/empathy.c	2009-08-03 23:14:03.385652105 -0400
@@ -32,7 +32,7 @@
 #include <gdk/gdkx.h>
 
 #if HAVE_LIBCHAMPLAIN
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #endif
 
 #include <libebook/e-book.h>
diff -up empathy-2.27.5/src/empathy-map-view.c.clutter empathy-2.27.5/src/empathy-map-view.c
--- empathy-2.27.5/src/empathy-map-view.c.clutter	2009-08-03 23:15:22.429671111 -0400
+++ empathy-2.27.5/src/empathy-map-view.c	2009-08-03 23:17:08.445626300 -0400
@@ -26,7 +26,7 @@
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-contact.h>
@@ -190,7 +190,7 @@ map_view_contacts_foreach (GtkTreeModel 
   if (avatar != NULL)
     {
       texture = clutter_texture_new ();
-      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
+      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar, NULL);
       champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
       g_object_unref (avatar);
     }