diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-02 17:54:35 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 17:54:35 +0000 |
| commit | 40ce95ca64d662c16cec3d1efabc966dda5a2610 (patch) | |
| tree | c5687492fbbc7f7e46b8db8448b1da640fef9955 /packages/gaim | |
| parent | 858ca7bc53e7c03eac036217486e87e36eb1e3e6 (diff) | |
| parent | 966f3a94af2c83ffd2c634171fbe04917731b6f9 (diff) | |
explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/gaim')
| -rw-r--r-- | packages/gaim/files/gevolution-eds-dbus.patch | 53 | ||||
| -rw-r--r-- | packages/gaim/gaim.inc | 9 | ||||
| -rw-r--r-- | packages/gaim/gaim_cvs.bb | 1 |
3 files changed, 61 insertions, 2 deletions
diff --git a/packages/gaim/files/gevolution-eds-dbus.patch b/packages/gaim/files/gevolution-eds-dbus.patch new file mode 100644 index 0000000000..0b7479d4f7 --- /dev/null +++ b/packages/gaim/files/gevolution-eds-dbus.patch @@ -0,0 +1,53 @@ +--- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100 ++++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100 +@@ -38,17 +38,12 @@ + +-#include <libedata-book/Evolution-DataServer-Addressbook.h> + +-#include <libebook/e-book-listener.h> +-#include <libedata-book/e-data-book-factory.h> +-#include <bonobo/bonobo-main.h> ++#include <libebook/e-book-view-listener.h> ++#include <libebook/e-data-book-factory-bindings.h> + + #include <glib.h> + + #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution" + +-#define E_DATA_BOOK_FACTORY_OAF_ID \ +- "OAFIID:GNOME_Evolution_DataServer_BookFactory" +- + enum + { + COLUMN_AUTOADD, +@@ -324,8 +320,6 @@ + static gboolean + plugin_load(GaimPlugin *plugin) + { +- bonobo_activate(); +- + backup_blist_ui_ops = gaim_blist_get_ui_ops(); + + blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps)); +@@ -370,7 +364,6 @@ + static void + plugin_destroy(GaimPlugin *plugin) + { +- bonobo_debug_shutdown(); + } + + static void +@@ -563,13 +556,6 @@ + * So, in conclusion, this is an evil hack, but it doesn't harm anything + * and it works. + */ +- g_module_make_resident(plugin->handle); +- +- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(), +- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) +- { +- gaim_debug_error("evolution", "Unable to initialize bonobo.\n"); +- } + } + + GAIM_INIT_PLUGIN(gevolution, init_plugin, info) diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc index 4fdcb4431b..b00dc8f9ca 100644 --- a/packages/gaim/gaim.inc +++ b/packages/gaim/gaim.inc @@ -4,7 +4,7 @@ MAINTAINER = "Mads Chr. Olesen <gaim@shiyee.dk>" LICENSE = "GPL" DEPENDS = "gtk+ gnutls virtual/libintl" -RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber" +RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet" EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated" @@ -18,11 +18,16 @@ FILES_${PN}-dev += "${libdir}/gaim/*.la" inherit autotools gettext -PACKAGES_DYNAMIC = "gaim-protocol-*" +PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*" python populate_packages_prepend () { root = bb.data.expand('${libdir}/gaim', d) + do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + output_pattern='gaim-plugin-%s', + description='GAIM plugin %s', + prepend=True) + do_split_packages(d, root, '^lib(.*)\.so$', output_pattern='gaim-protocol-%s', description='GAIM protocol plugin for %s', diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index faf707a867..921fb7c261 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -5,6 +5,7 @@ PV = "2.0+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ file://gtk-deprecated-2.0.0.patch;patch=1 \ + file://gevolution-eds-dbus.patch;patch=1 \ " include gaim.inc |