[oe-commits] org.oe.dev empathy: merge with poky

[koen commit]

empathy: merge with poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 69a5b54d55610e079d2f836970f592c99b343409
ViewMTN: http://monotone.openembedded.org/revision.psp?id=69a5b54d55610e079d2f836970f592c99b343409
Files:
1
packages/telepathy/empathy-0.1
packages/telepathy/empathy-0.1/no-gnome.diff
packages/telepathy/empathy_0.1.bb
Diffs:

#
# mt diff -rb8d9cc0dc73b3a02003be79ac7eca181cf0979d4 -r69a5b54d55610e079d2f836970f592c99b343409
#
# 
# 
# add_dir "packages/telepathy/empathy-0.1"
# 
# add_file "packages/telepathy/empathy-0.1/no-gnome.diff"
#  content [0600da3378a4319e070751ce1606df9a2082a92f]
# 
# add_file "packages/telepathy/empathy_0.1.bb"
#  content [524413dfe25c2243406c527bf3f7ae41506d1a0e]
# 
============================================================
--- packages/telepathy/empathy-0.1/no-gnome.diff	0600da3378a4319e070751ce1606df9a2082a92f
+++ packages/telepathy/empathy-0.1/no-gnome.diff	0600da3378a4319e070751ce1606df9a2082a92f
@@ -0,0 +1,39 @@
+diff -ur empathy-0.1.orig/configure.ac empathy-0.1/configure.ac
+--- empathy-0.1.orig/configure.ac	2007-04-25 23:05:40.000000000 +0100
++++ empathy-0.1/configure.ac	2007-04-27 17:10:29.000000000 +0100
+@@ -39,12 +39,12 @@
+ 
+ PKG_CHECK_MODULES(EMPATHY,
+ [
++   libxml-2.0
+    glib-2.0 >= $GLIB_REQUIRED
+    gobject-2.0
+    gtk+-2.0 >= $GTK_REQUIRED
+    gconf-2.0 >= $GCONF_REQUIRED
+    libglade-2.0 >= $LIBGLADE_REQUIRED
+-   libgnomeui-2.0
+    libtelepathy >= $TELEPATHY_REQUIRED
+    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+ ])
+Only in empathy-0.1: configure.ac~
+diff -ur empathy-0.1.orig/libempathy-gtk/gossip-ui-utils.c empathy-0.1/libempathy-gtk/gossip-ui-utils.c
+--- empathy-0.1.orig/libempathy-gtk/gossip-ui-utils.c	2007-04-25 23:05:40.000000000 +0100
++++ empathy-0.1/libempathy-gtk/gossip-ui-utils.c	2007-04-27 17:06:48.000000000 +0100
+@@ -31,7 +31,6 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <glade/glade.h>
+-#include <libgnome/libgnome.h>
+ 
+ #include <libmissioncontrol/mc-profile.h>
+ 
+@@ -1307,7 +1306,7 @@
+ 	GError *error = NULL;
+ 
+ 	real_url = fixup_url (url);
+-	gnome_url_show (real_url, &error);
++	g_warning ("TODO: gnome_url_show (real_url, &error);");
+ 	if (error) {
+ 		g_warning ("Couldn't show URL:'%s'", real_url);
+ 		g_error_free (error);
+Only in empathy-0.1/libempathy-gtk: gossip-ui-utils.c~
============================================================
--- packages/telepathy/empathy_0.1.bb	524413dfe25c2243406c527bf3f7ae41506d1a0e
+++ packages/telepathy/empathy_0.1.bb	524413dfe25c2243406c527bf3f7ae41506d1a0e
@@ -0,0 +1,17 @@
+DESCRIPTION = "Empathy: a Telepathy based IM client"
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+
+PR="r1"
+
+SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \
+        file://no-gnome.diff;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "/usr/share/mission-control/profiles/*.profile \
+        /usr/share/dbus-1/services/*.service \
+        /usr/share/telepathy/managers/*.chandler"