summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-21 09:14:53 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-21 09:14:53 +0000
commit706229768c3814a94de5e2374c6974397136a7f0 (patch)
tree295b75632097a6f257fb3576de55ebb74545f193 /meta
parentf02f67c3b942506cfb6506691982d1d1fa26b05c (diff)
downloadpoky-706229768c3814a94de5e2374c6974397136a7f0.tar.gz
empathy: upgraded to 0.23.4
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4903 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/telepathy/empathy-0.9/no-gnome.diff57
-rw-r--r--meta/packages/telepathy/empathy/no-gnome-doc.patch39
-rw-r--r--meta/packages/telepathy/empathy_0.23.4.bb20
-rw-r--r--meta/packages/telepathy/empathy_0.9.bb17
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 @@
1Index: src/empathy.c
2===================================================================
3--- src/empathy.c.orig 2007-07-25 13:42:16.000000000 +0100
4+++ src/empathy.c 2007-07-25 13:42:47.000000000 +0100
5@@ -28,9 +28,6 @@
6 #include <glib/gi18n.h>
7 #include <gtk/gtk.h>
8
9-#include <libgnome/gnome-program.h>
10-#include <libgnomeui/gnome-ui-init.h>
11-
12 #include <libtelepathy/tp-conn.h>
13 #include <libtelepathy/tp-chan.h>
14 #include <libmissioncontrol/mc-account.h>
15@@ -151,7 +148,6 @@
16 McAccountMonitor *monitor;
17 EmpathyIdle *idle;
18 EmpathyChandler *chandler;
19- GnomeProgram *program;
20 gboolean no_connect = FALSE;
21 GOptionContext *context;
22 GOptionEntry options[] = {
23@@ -170,15 +166,7 @@
24 g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
25
26 g_set_application_name (PACKAGE_NAME);
27-
28- program = gnome_program_init ("empathy",
29- PACKAGE_VERSION,
30- LIBGNOMEUI_MODULE,
31- argc, argv,
32- GNOME_PROGRAM_STANDARD_PROPERTIES,
33- "goption-context", context,
34- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
35- NULL);
36+ gtk_init (&argc, &argv);
37
38 gtk_window_set_default_icon_name ("empathy");
39 gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
40@@ -221,7 +209,6 @@
41 g_object_unref (mc);
42 g_object_unref (idle);
43 g_object_unref (icon);
44- g_object_unref (program);
45
46 return EXIT_SUCCESS;
47 }
48--- configure.ac.old 2007-08-02 12:31:28.000000000 +0100
49+++ configure.ac 2007-08-02 12:31:36.000000000 +0100
50@@ -73,7 +73,6 @@
51 libmissioncontrol >= $MISSION_CONTROL_REQUIRED
52 gtk+-2.0 >= $GTK_REQUIRED
53 libglade-2.0 >= $LIBGLADE_REQUIRED
54- libgnomeui-2.0
55 ])
56
57 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 @@
1---
2 Makefile.am | 2 +-
3 configure.ac | 1 -
4 help/Makefile.am | 1 -
5 3 files changed, 1 insertion(+), 3 deletions(-)
6
7--- empathy-0.23.4.orig/Makefile.am
8+++ empathy-0.23.4/Makefile.am
9@@ -1,6 +1,6 @@
10-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
11+SUBDIRS = tools extensions po data libempathy libempathy-gtk src
12
13 if HAVE_MEGAPHONE
14 SUBDIRS += megaphone
15 endif
16
17--- empathy-0.23.4.orig/configure.ac
18+++ empathy-0.23.4/configure.ac
19@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
20 AM_PROG_MKDIR_P
21 AM_PATH_GLIB_2_0
22 AC_PATH_XTRA
23 IT_PROG_INTLTOOL([0.35.0])
24 GTK_DOC_CHECK([1.3])
25-GNOME_DOC_INIT
26 IDT_COMPILE_WARNINGS
27 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
28 AC_PATH_PROG(GCONFTOOL, gconftool-2)
29 AM_GCONF_SOURCE_2
30 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
31--- empathy-0.23.4.orig/help/Makefile.am
32+++ empathy-0.23.4/help/Makefile.am
33@@ -1,6 +1,5 @@
34-include $(top_srcdir)/gnome-doc-utils.make
35
36 DOC_MODULE = empathy
37 DOC_ENTITIES = legal.xml
38 DOC_FIGURES = \
39 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 @@
1DESCRIPTION = "Telepathy based IM client"
2HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
3LICENSE = "GPL"
4DEPENDS = "telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
5RRECOMMENDS = "telepathy-gabble"
6
7inherit gnome gtk-icon-cache
8
9SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-${PV}.tar.bz2 \
10 file://no-gnome-doc.patch;patch=1"
11
12FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
13 ${datadir}/dbus-1/services/*.service \
14 ${datadir}/telepathy/managers/*.chandler \
15 ${datadir}/icons"
16
17PACKAGES =+ "libempathy libempathy-gtk"
18
19FILES_libempathy = "${libdir}/libempathy.so.*"
20FILES_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 @@
1DESCRIPTION = "Telepathy based IM client"
2HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
3LICENSE = "GPL"
4DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs"
5RDEPENDS = "telepathy-mission-control"
6RRECOMMENDS = "telepathy-gabble"
7
8PR = "r3"
9
10inherit gnome gtk-icon-cache
11
12SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.9/empathy-${PV}.tar.bz2 \
13 file://no-gnome.diff;patch=1;pnum=0"
14
15FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
16 ${datadir}/dbus-1/services/*.service \
17 ${datadir}/telepathy/managers/*.chandler"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:11:47 +0000