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 | poky-39debb79702766cc8b1fabf6415bda73235853d1.tar.gz |
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 @@ | |||
1 | Index: eds-feed-0.3.2/configure.ac | ||
2 | =================================================================== | ||
3 | --- eds-feed-0.3.2.orig/configure.ac 2005-08-28 19:11:39.000000000 +0000 | ||
4 | +++ eds-feed-0.3.2/configure.ac 2005-12-16 09:22:10.000000000 +0000 | ||
5 | @@ -65,7 +65,7 @@ | ||
6 | libxml-2.0) | ||
7 | |||
8 | # Check which version of eds we're using | ||
9 | -PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4 libedata-book-1.2 >= 1.1.4) | ||
10 | +PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4) | ||
11 | |||
12 | PACKAGE_CFLAGS="$PACKAGE_CFLAGS $EDS_CFLAGS" | ||
13 | PACKAGE_LIBS="$PACKAGE_LIBS $EDS_LIBS" | ||
14 | Index: eds-feed-0.3.2/src/main.c | ||
15 | =================================================================== | ||
16 | --- eds-feed-0.3.2.orig/src/main.c 2005-08-21 07:26:02.000000000 +0000 | ||
17 | +++ eds-feed-0.3.2/src/main.c 2005-12-16 09:24:38.000000000 +0000 | ||
18 | @@ -20,17 +20,11 @@ | ||
19 | */ | ||
20 | #include <glib.h> | ||
21 | #include <libgalago/galago.h> | ||
22 | -#include <libedata-book/Evolution-DataServer-Addressbook.h> | ||
23 | |||
24 | #include <libebook/e-book.h> | ||
25 | -#include <libedata-book/e-data-book-factory.h> | ||
26 | -#include <bonobo/bonobo-main.h> | ||
27 | |||
28 | #include <string.h> | ||
29 | |||
30 | -#define E_DATA_BOOK_FACTORY_OAF_ID \ | ||
31 | - "OAFIID:GNOME_Evolution_DataServer_BookFactory" | ||
32 | - | ||
33 | static EBookView *book_view = NULL; | ||
34 | static EBook *book = NULL; | ||
35 | static gulong book_view_tag = 0; | ||
36 | @@ -157,8 +151,8 @@ | ||
37 | galago_person_set_photo(person, NULL); | ||
38 | else | ||
39 | { | ||
40 | - galago_photo_new(person, (unsigned char *)ephoto->data, | ||
41 | - ephoto->length); | ||
42 | +// galago_photo_new(person, (unsigned char *)ephoto->data, | ||
43 | +// ephoto->length); | ||
44 | } | ||
45 | } | ||
46 | |||
47 | @@ -294,15 +288,6 @@ | ||
48 | |||
49 | galago_core_set_exit_with_daemon(TRUE); | ||
50 | |||
51 | - if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(), | ||
52 | - CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) | ||
53 | - { | ||
54 | - fprintf(stderr, "Unable to initialize bonobo.\n"); | ||
55 | - exit(1); | ||
56 | - } | ||
57 | - | ||
58 | - bonobo_activate(); | ||
59 | - | ||
60 | setup_book_view(); | ||
61 | setup_services(); | ||
62 | |||
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 @@ | |||
1 | DESCRIPTION = "Galago linkage to the Evolution Data Server." | ||
2 | HOMEPAGE = "http://www.galago-project.org/" | ||
3 | LICENSE = "GPL" | ||
4 | DEPENDS = "gettext libgalago dbus glib-2.0 eds-dbus" | ||
5 | |||
6 | SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ | ||
7 | file://disable-bonobo.patch;patch=1" | ||
8 | # file://no-check.patch;patch=1" | ||
9 | #EXTRA_OECONF = "--disable-binreloc" | ||
10 | |||
11 | FILES_${PN} += "${libdir}/galago/eds-feed" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||