empathy: upgraded to 0.23.4

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

4 files changed, 59 insertions, 74 deletions

diff --git a/meta/packages/telepathy/empathy-0.9/no-gnome.diff b/meta/packages/telepathy/empathy-0.9/no-gnome.diff
deleted file mode 100644
index 4aaadacd9b..0000000000
--- a/meta/packages/telepathy/empathy-0.9/no-gnome.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: src/empathy.c
-===================================================================
---- src/empathy.c.orig	2007-07-25 13:42:16.000000000 +0100
-+++ src/empathy.c	2007-07-25 13:42:47.000000000 +0100
-@@ -28,9 +28,6 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
--#include <libgnome/gnome-program.h>
--#include <libgnomeui/gnome-ui-init.h>
--
- #include <libtelepathy/tp-conn.h>
- #include <libtelepathy/tp-chan.h>
- #include <libmissioncontrol/mc-account.h>
-@@ -151,7 +148,6 @@
- 	McAccountMonitor  *monitor;
- 	EmpathyIdle       *idle;
- 	EmpathyChandler   *chandler;
--	GnomeProgram      *program;
- 	gboolean           no_connect = FALSE;
- 	GOptionContext    *context;
- 	GOptionEntry       options[] = {
-@@ -170,15 +166,7 @@
- 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
- 
- 	g_set_application_name (PACKAGE_NAME);
--
--	program = gnome_program_init ("empathy",
--				      PACKAGE_VERSION,
--				      LIBGNOMEUI_MODULE,
--				      argc, argv,
--				      GNOME_PROGRAM_STANDARD_PROPERTIES,
--				      "goption-context", context,
--				      GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
--				      NULL);
-+	gtk_init (&argc, &argv);
- 
- 	gtk_window_set_default_icon_name ("empathy");
- 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-@@ -221,7 +209,6 @@
- 	g_object_unref (mc);
- 	g_object_unref (idle);
- 	g_object_unref (icon);
--	g_object_unref (program);
- 
- 	return EXIT_SUCCESS;
- }
---- configure.ac.old    2007-08-02 12:31:28.000000000 +0100
-+++ configure.ac        2007-08-02 12:31:36.000000000 +0100
-@@ -73,7 +73,6 @@
-    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-    gtk+-2.0 >= $GTK_REQUIRED
-    libglade-2.0 >= $LIBGLADE_REQUIRED
--   libgnomeui-2.0
- ])
- 
- dnl -----------------------------------------------------------
diff --git a/meta/packages/telepathy/empathy/no-gnome-doc.patch b/meta/packages/telepathy/empathy/no-gnome-doc.patch
new file mode 100644
index 0000000000..13e7943da5
--- /dev/null
+++ b/meta/packages/telepathy/empathy/no-gnome-doc.patch
@@ -0,0 +1,39 @@
+---
+ Makefile.am      |    2 +-
+ configure.ac     |    1 -
+ help/Makefile.am |    1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+--- empathy-0.23.4.orig/Makefile.am
++++ empathy-0.23.4/Makefile.am
+@@ -1,6 +1,6 @@
+-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
++SUBDIRS = tools extensions po data libempathy libempathy-gtk src
+ 
+ if HAVE_MEGAPHONE
+ SUBDIRS += megaphone
+ endif
+ 
+--- empathy-0.23.4.orig/configure.ac
++++ empathy-0.23.4/configure.ac
+@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
+ AM_PROG_MKDIR_P
+ AM_PATH_GLIB_2_0
+ AC_PATH_XTRA
+ IT_PROG_INTLTOOL([0.35.0])
+ GTK_DOC_CHECK([1.3])
+-GNOME_DOC_INIT
+ IDT_COMPILE_WARNINGS
+ AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
+ GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
+--- empathy-0.23.4.orig/help/Makefile.am
++++ empathy-0.23.4/help/Makefile.am
+@@ -1,6 +1,5 @@
+-include $(top_srcdir)/gnome-doc-utils.make
+ 
+ DOC_MODULE = empathy
+ DOC_ENTITIES = legal.xml
+ DOC_FIGURES = \
+ 	figures/empathy-main-window.png \
diff --git a/meta/packages/telepathy/empathy_0.23.4.bb b/meta/packages/telepathy/empathy_0.23.4.bb
new file mode 100644
index 0000000000..67020a0fb1
--- /dev/null
+++ b/meta/packages/telepathy/empathy_0.23.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Telepathy based IM client"
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+RRECOMMENDS = "telepathy-gabble"
+
+inherit gnome gtk-icon-cache
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-${PV}.tar.bz2 \
+           file://no-gnome-doc.patch;patch=1"
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+        ${datadir}/dbus-1/services/*.service \
+        ${datadir}/telepathy/managers/*.chandler \
+	${datadir}/icons"
+
+PACKAGES =+ "libempathy libempathy-gtk"
+
+FILES_libempathy = "${libdir}/libempathy.so.*"
+FILES_libempathy-gtk = "${libdir}/libempathy-gtk.so.*"
diff --git a/meta/packages/telepathy/empathy_0.9.bb b/meta/packages/telepathy/empathy_0.9.bb
deleted file mode 100644
index 4ea5835c5b..0000000000
--- a/meta/packages/telepathy/empathy_0.9.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "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 gnome-vfs"
-RDEPENDS = "telepathy-mission-control"
-RRECOMMENDS = "telepathy-gabble"
-
-PR = "r3"
-
-inherit gnome gtk-icon-cache
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.9/empathy-${PV}.tar.bz2 \
-           file://no-gnome.diff;patch=1;pnum=0"
-
-FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
-                ${datadir}/dbus-1/services/*.service \
-                ${datadir}/telepathy/managers/*.chandler"