diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-11 10:33:24 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-11 10:33:24 +0000 |
| commit | 39debb79702766cc8b1fabf6415bda73235853d1 (patch) | |
| tree | 23a30fbcb92e41cf46f2118d3d81396adf18b837 /meta | |
| parent | 23b9718ff70049806a7d42900533d8d8a2d0631b (diff) | |
| download | openembedded-core-39debb79702766cc8b1fabf6415bda73235853d1.tar.gz openembedded-core-39debb79702766cc8b1fabf6415bda73235853d1.tar.bz2 openembedded-core-39debb79702766cc8b1fabf6415bda73235853d1.zip | |
eds-feed: removed per discussion with Ross
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1476 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/galago/eds-feed/disable-bonobo.patch | 62 | ||||
| -rw-r--r-- | meta/packages/galago/eds-feed_0.3.2.bb | 14 |
2 files changed, 0 insertions, 76 deletions
diff --git a/meta/packages/galago/eds-feed/disable-bonobo.patch b/meta/packages/galago/eds-feed/disable-bonobo.patch deleted file mode 100644 index 3a2097877a..0000000000 --- a/meta/packages/galago/eds-feed/disable-bonobo.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: eds-feed-0.3.2/configure.ac -=================================================================== ---- eds-feed-0.3.2.orig/configure.ac 2005-08-28 19:11:39.000000000 +0000 -+++ eds-feed-0.3.2/configure.ac 2005-12-16 09:22:10.000000000 +0000 -@@ -65,7 +65,7 @@ - libxml-2.0) - - # Check which version of eds we're using --PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4 libedata-book-1.2 >= 1.1.4) -+PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4) - - PACKAGE_CFLAGS="$PACKAGE_CFLAGS $EDS_CFLAGS" - PACKAGE_LIBS="$PACKAGE_LIBS $EDS_LIBS" -Index: eds-feed-0.3.2/src/main.c -=================================================================== ---- eds-feed-0.3.2.orig/src/main.c 2005-08-21 07:26:02.000000000 +0000 -+++ eds-feed-0.3.2/src/main.c 2005-12-16 09:24:38.000000000 +0000 -@@ -20,17 +20,11 @@ - */ - #include <glib.h> - #include <libgalago/galago.h> --#include <libedata-book/Evolution-DataServer-Addressbook.h> - - #include <libebook/e-book.h> --#include <libedata-book/e-data-book-factory.h> --#include <bonobo/bonobo-main.h> - - #include <string.h> - --#define E_DATA_BOOK_FACTORY_OAF_ID \ -- "OAFIID:GNOME_Evolution_DataServer_BookFactory" -- - static EBookView *book_view = NULL; - static EBook *book = NULL; - static gulong book_view_tag = 0; -@@ -157,8 +151,8 @@ - galago_person_set_photo(person, NULL); - else - { -- galago_photo_new(person, (unsigned char *)ephoto->data, -- ephoto->length); -+// galago_photo_new(person, (unsigned char *)ephoto->data, -+// ephoto->length); - } - } - -@@ -294,15 +288,6 @@ - - galago_core_set_exit_with_daemon(TRUE); - -- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(), -- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) -- { -- fprintf(stderr, "Unable to initialize bonobo.\n"); -- exit(1); -- } -- -- bonobo_activate(); -- - setup_book_view(); - setup_services(); - diff --git a/meta/packages/galago/eds-feed_0.3.2.bb b/meta/packages/galago/eds-feed_0.3.2.bb deleted file mode 100644 index 5ad9a822a6..0000000000 --- a/meta/packages/galago/eds-feed_0.3.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Galago linkage to the Evolution Data Server." -HOMEPAGE = "http://www.galago-project.org/" -LICENSE = "GPL" -DEPENDS = "gettext libgalago dbus glib-2.0 eds-dbus" - -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ - file://disable-bonobo.patch;patch=1" -# file://no-check.patch;patch=1" -#EXTRA_OECONF = "--disable-binreloc" - -FILES_${PN} += "${libdir}/galago/eds-feed" - -inherit autotools pkgconfig - |