packages (DEVEL): empathy/empathy.spec, empathy/empathy-clutter-gtk-0.10.pa...

[patrys]

Author: patrys                       Date: Thu Aug 13 08:15:50 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- build with new clutter
- disable useless static

---- Files affected:
packages/empathy:
   empathy.spec (1.47.2.7 -> 1.47.2.8) , empathy-clutter-gtk-0.10.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/empathy/empathy.spec
diff -u packages/empathy/empathy.spec:1.47.2.7 packages/empathy/empathy.spec:1.47.2.8
--- packages/empathy/empathy.spec:1.47.2.7	Wed Aug 12 10:42:14 2009
+++ packages/empathy/empathy.spec	Thu Aug 13 10:15:45 2009
@@ -92,18 +92,6 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe Empathy.
 
-%package static
-Summary:	Empathy static libraries
-Summary(pl.UTF-8):	Statyczne biblioteki Empathy
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Empathy static libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki Empathy.
-
 %package apidocs
 Summary:	Empathy API documentation
 Summary(pl.UTF-8):	Dokumentacja API Empathy
@@ -142,6 +130,7 @@
 %configure \
 	--with-compile-warnings=no \
 	--disable-schemas-install \
+	--disable-static \
 	--enable-location \
 	--enable-gtk-doc \
 	--enable-shave \
@@ -211,11 +200,6 @@
 %{_pkgconfigdir}/libempathy.pc
 %{_pkgconfigdir}/libempathy-gtk.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libempathy.a
-%{_libdir}/libempathy-gtk.a
-
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libempathy
@@ -232,6 +216,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47.2.8  2009/08/13 08:15:45  patrys
+- build with new clutter
+- disable useless static
+
 Revision 1.47.2.7  2009/08/12 08:42:14  patrys
 - build with new clutter-gtk
 

================================================================
Index: packages/empathy/empathy-clutter-gtk-0.10.patch
diff -u /dev/null packages/empathy/empathy-clutter-gtk-0.10.patch:1.1.2.1
--- /dev/null	Thu Aug 13 10:15:50 2009
+++ packages/empathy/empathy-clutter-gtk-0.10.patch	Thu Aug 13 10:15:45 2009
@@ -0,0 +1,57 @@
+diff --git a/configure.ac b/configure.ac
+index 682f6a7..0088b4e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ LIBNOTIFY_REQUIRED=0.4.4
+ LIBCANBERRA_GTK_REQUIRED=0.4
+ LIBCHAMPLAIN_REQUIRED=0.3.3
+ LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
+-CLUTTER_GTK_REQUIRED=0.8.2
++CLUTTER_GTK_REQUIRED=0.10.0
+ GEOCLUE_REQUIRED=0.11
+ WEBKIT_REQUIRED=1.1.7
+ NETWORK_MANAGER_REQUIRED=0.7.0
+@@ -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 --git a/src/empathy-map-view.c b/src/empathy-map-view.c
+index 86e15bd..3bcc5f3 100644
+--- a/src/empathy-map-view.c
++++ b/src/empathy-map-view.c
+@@ -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 *model,
+   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);
+     }
+diff --git a/src/empathy.c b/src/empathy.c
+index 4ff0918..15155d2 100644
+--- a/src/empathy.c
++++ b/src/empathy.c
+@@ -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>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/empathy/empathy.spec?r1=1.47.2.7&r2=1.47.2.8&f=u