diff options
Diffstat (limited to 'meta/recipes-sato/eds/evolution-data-server')
8 files changed, 665 insertions, 0 deletions
diff --git a/meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch b/meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch new file mode 100644 index 0000000000..0785a9387a --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid | ||
2 | build failures. Also resolve other deprecation issues. | ||
3 | |||
4 | RP 2011/10/12 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: git/libedataserver/e-data-server-util.c | ||
9 | =================================================================== | ||
10 | --- git.orig/libedataserver/e-data-server-util.c 2011-10-12 01:42:40.622045788 +0100 | ||
11 | +++ git/libedataserver/e-data-server-util.c 2011-10-12 01:48:16.732045664 +0100 | ||
12 | @@ -165,7 +165,8 @@ | ||
13 | static gunichar | ||
14 | stripped_char (gunichar ch) | ||
15 | { | ||
16 | - gunichar *decomp, retval; | ||
17 | + gunichar decomp[4]; | ||
18 | + gunichar retval; | ||
19 | GUnicodeType utype; | ||
20 | gsize dlen; | ||
21 | |||
22 | @@ -175,7 +176,7 @@ | ||
23 | case G_UNICODE_CONTROL: | ||
24 | case G_UNICODE_FORMAT: | ||
25 | case G_UNICODE_UNASSIGNED: | ||
26 | - case G_UNICODE_COMBINING_MARK: | ||
27 | + case G_UNICODE_SPACING_MARK: | ||
28 | /* Ignore those */ | ||
29 | return 0; | ||
30 | break; | ||
31 | @@ -183,7 +184,7 @@ | ||
32 | /* Convert to lowercase, fall through */ | ||
33 | ch = g_unichar_tolower (ch); | ||
34 | case G_UNICODE_LOWERCASE_LETTER: | ||
35 | - if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) { | ||
36 | + if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) { | ||
37 | retval = decomp[0]; | ||
38 | g_free (decomp); | ||
39 | return retval; | ||
40 | Index: git/addressbook/libedata-book/e-data-book-factory.c | ||
41 | =================================================================== | ||
42 | --- git.orig/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:52:25.692045500 +0100 | ||
43 | +++ git/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:53:31.862045707 +0100 | ||
44 | @@ -238,7 +238,7 @@ | ||
45 | return g_strdup_printf ( | ||
46 | "/org/gnome/evolution/dataserver/addressbook/%d/%u", | ||
47 | getpid (), | ||
48 | - g_atomic_int_exchange_and_add (&counter, 1)); | ||
49 | + g_atomic_int_add (&counter, 1)); | ||
50 | } | ||
51 | |||
52 | static void | ||
53 | Index: git/addressbook/libedata-book/e-data-book.c | ||
54 | =================================================================== | ||
55 | --- git.orig/addressbook/libedata-book/e-data-book.c 2011-10-12 01:54:40.752045465 +0100 | ||
56 | +++ git/addressbook/libedata-book/e-data-book.c 2011-10-12 01:55:16.012045897 +0100 | ||
57 | @@ -553,7 +553,7 @@ | ||
58 | |||
59 | return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d", | ||
60 | getpid (), | ||
61 | - g_atomic_int_exchange_and_add ((int*)&counter, 1)); | ||
62 | + g_atomic_int_add ((int*)&counter, 1)); | ||
63 | } | ||
64 | |||
65 | static void | ||
66 | Index: git/calendar/libedata-cal/e-data-cal-factory.c | ||
67 | =================================================================== | ||
68 | --- git.orig/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:56.612045081 +0100 | ||
69 | +++ git/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:58.832045211 +0100 | ||
70 | @@ -227,7 +227,7 @@ | ||
71 | return g_strdup_printf ( | ||
72 | "/org/gnome/evolution/dataserver/calendar/%d/%u", | ||
73 | getpid (), | ||
74 | - g_atomic_int_exchange_and_add (&counter, 1)); | ||
75 | + g_atomic_int_add (&counter, 1)); | ||
76 | } | ||
77 | |||
78 | static void | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/iconv-detect.h b/meta/recipes-sato/eds/evolution-data-server/iconv-detect.h new file mode 100644 index 0000000000..46f476d5bc --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/iconv-detect.h | |||
@@ -0,0 +1,5 @@ | |||
1 | /* This is an auto-generated header, DO NOT EDIT! */ | ||
2 | |||
3 | #define ICONV_ISO_D_FORMAT "iso-%d-%d" | ||
4 | #define ICONV_ISO_S_FORMAT "iso-%d-%s" | ||
5 | #define ICONV_10646 "iso-10646" | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch b/meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch new file mode 100644 index 0000000000..22c293ddab --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | When contacts called for the 1st time, adding new contact always failed but | ||
2 | worked after restart. The reason is e-addressbook-factory used to handle | ||
3 | addressbook leads a segmentation fault. Root cause is that factory would create | ||
4 | the data base if not exist, but use it without proper initialization. | ||
5 | |||
6 | This patch fix it. | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | |||
10 | Signed-off-by: Edwin Zhai <edwin.zhai@intel.com> | ||
11 | Index: git/addressbook/backends/file/e-book-backend-file.c | ||
12 | =================================================================== | ||
13 | --- git.orig/addressbook/backends/file/e-book-backend-file.c 2010-10-20 16:14:31.000000000 +0800 | ||
14 | +++ git/addressbook/backends/file/e-book-backend-file.c 2010-10-22 14:11:47.000000000 +0800 | ||
15 | @@ -1217,6 +1217,8 @@ | ||
16 | EContact *contact = NULL; | ||
17 | EBookBackendSyncStatus status; | ||
18 | |||
19 | + /* Initialize file_db, or else following do_create cause seg fault */ | ||
20 | + bf->priv->file_db = db; | ||
21 | status = do_create (bf, XIMIAN_VCARD, &contact); | ||
22 | if (status != GNOME_Evolution_Addressbook_Success) | ||
23 | g_warning ("Cannot create default contact: %d", status); | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/nossl.patch b/meta/recipes-sato/eds/evolution-data-server/nossl.patch new file mode 100644 index 0000000000..67b6d071e0 --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/nossl.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Index: git/camel/Makefile.am | ||
4 | =================================================================== | ||
5 | --- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000 | ||
6 | +++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000 | ||
7 | @@ -80,7 +80,6 @@ | ||
8 | camel-store-summary.c \ | ||
9 | camel-store.c \ | ||
10 | camel-tcp-stream-raw.c \ | ||
11 | - camel-tcp-stream-ssl.c \ | ||
12 | camel-tcp-stream.c \ | ||
13 | camel-transport.c \ | ||
14 | camel-uid-cache.c \ | ||
15 | @@ -133,7 +132,6 @@ | ||
16 | camel-store-summary.h \ | ||
17 | camel-store.h \ | ||
18 | camel-tcp-stream-raw.h \ | ||
19 | - camel-tcp-stream-ssl.h \ | ||
20 | camel-tcp-stream.h \ | ||
21 | camel-transport.h \ | ||
22 | camel-uid-cache.h \ | ||
23 | Index: git/camel/camel.h | ||
24 | =================================================================== | ||
25 | --- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000 | ||
26 | +++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000 | ||
27 | @@ -122,7 +122,6 @@ | ||
28 | #include <camel/camel-string-utils.h> | ||
29 | #include <camel/camel-tcp-stream.h> | ||
30 | #include <camel/camel-tcp-stream-raw.h> | ||
31 | -#include <camel/camel-tcp-stream-ssl.h> | ||
32 | #include <camel/camel-text-index.h> | ||
33 | #include <camel/camel-transport.h> | ||
34 | #include <camel/camel-trie.h> | ||
35 | Index: git/camel/providers/imap/camel-imap-store.c | ||
36 | =================================================================== | ||
37 | --- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000 | ||
38 | +++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000 | ||
39 | @@ -51,7 +51,6 @@ | ||
40 | #include "camel/camel-stream.h" | ||
41 | #include "camel/camel-string-utils.h" | ||
42 | #include "camel/camel-tcp-stream-raw.h" | ||
43 | -#include "camel/camel-tcp-stream-ssl.h" | ||
44 | #include "camel/camel-url.h" | ||
45 | #include "camel/camel-utf8.h" | ||
46 | |||
47 | Index: git/configure.ac | ||
48 | =================================================================== | ||
49 | --- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000 | ||
50 | +++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000 | ||
51 | @@ -1272,7 +1272,8 @@ | ||
52 | dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from | ||
53 | dnl libical is fixed, we have to work-around the buggy CFlags. | ||
54 | dnl ***** | ||
55 | - LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` " | ||
56 | + m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) | ||
57 | + LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` " | ||
58 | LIBICAL_EXTRA_LIBS="" | ||
59 | AC_SUBST(LIBICAL_EXTRA_CFLAGS) | ||
60 | AC_SUBST(LIBICAL_EXTRA_LIBS) | ||
61 | Index: git/calendar/libecal/libecal.pc.in | ||
62 | =================================================================== | ||
63 | --- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000 | ||
64 | +++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000 | ||
65 | @@ -12,4 +12,4 @@ | ||
66 | Version: @VERSION@ | ||
67 | Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1 | ||
68 | Libs: -L${libdir} -lecal-1.2 | ||
69 | -Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@ | ||
70 | +Cflags: -I${privincludedir} | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/oh-contact.patch b/meta/recipes-sato/eds/evolution-data-server/oh-contact.patch new file mode 100644 index 0000000000..b746044ffc --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/oh-contact.patch | |||
@@ -0,0 +1,203 @@ | |||
1 | Replace the Novell sample contact with something more appropriate | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Index: addressbook/libedata-book/ximian-vcard.h | ||
6 | =================================================================== | ||
7 | --- addressbook/libedata-book/ximian-vcard.h.orig 2011-12-19 13:58:29.058859231 +0000 | ||
8 | +++ addressbook/libedata-book/ximian-vcard.h 2011-12-19 14:41:48.678918549 +0000 | ||
9 | @@ -1,80 +1,105 @@ | ||
10 | #define XIMIAN_VCARD \ | ||
11 | "BEGIN:VCARD\n" \ | ||
12 | -"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \ | ||
13 | -"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \ | ||
14 | -"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \ | ||
15 | -"TEL;WORK;VOICE:(617) 613-2000\n" \ | ||
16 | -"TEL;WORK;FAX:(617) 613-2001\n" \ | ||
17 | -"EMAIL;INTERNET:hello@ximian.com\n" \ | ||
18 | -"URL:http://www.ximian.com/\n" \ | ||
19 | -"ORG:Novell;Ximian Group\n" \ | ||
20 | -"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \ | ||
21 | -" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \ | ||
22 | -" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \ | ||
23 | -" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \ | ||
24 | -" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \ | ||
25 | -" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \ | ||
26 | -" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \ | ||
27 | -" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \ | ||
28 | -" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \ | ||
29 | -" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \ | ||
30 | -" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \ | ||
31 | -" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \ | ||
32 | -" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \ | ||
33 | -" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \ | ||
34 | -" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \ | ||
35 | -" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \ | ||
36 | -" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \ | ||
37 | -" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \ | ||
38 | -" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \ | ||
39 | -" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \ | ||
40 | -" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \ | ||
41 | -" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \ | ||
42 | -" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \ | ||
43 | -" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \ | ||
44 | -" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \ | ||
45 | -" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \ | ||
46 | -" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \ | ||
47 | -" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \ | ||
48 | -" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \ | ||
49 | -" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \ | ||
50 | -" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \ | ||
51 | -" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \ | ||
52 | -" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \ | ||
53 | -" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \ | ||
54 | -" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \ | ||
55 | -" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \ | ||
56 | -" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \ | ||
57 | -" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \ | ||
58 | -" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \ | ||
59 | -" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \ | ||
60 | -" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \ | ||
61 | -" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \ | ||
62 | -" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \ | ||
63 | -" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \ | ||
64 | -" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \ | ||
65 | -" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \ | ||
66 | -" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \ | ||
67 | -" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \ | ||
68 | -" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \ | ||
69 | -" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \ | ||
70 | -" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \ | ||
71 | -" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \ | ||
72 | -" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \ | ||
73 | -" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \ | ||
74 | -" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \ | ||
75 | -" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \ | ||
76 | -" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \ | ||
77 | -" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \ | ||
78 | -" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \ | ||
79 | -" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \ | ||
80 | -" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \ | ||
81 | -" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \ | ||
82 | -" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \ | ||
83 | -" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \ | ||
84 | -" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \ | ||
85 | -" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \ | ||
86 | -" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \ | ||
87 | -" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \ | ||
88 | -" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \ | ||
89 | +"VERSION:3.0\n" \ | ||
90 | +"FN:Yocto Project\n" \ | ||
91 | +"URL:http://www.yoctoproject.org/\n" \ | ||
92 | +"EMAIL:yocto@yoctoproject.org\n" \ | ||
93 | +"TEL;TYPE=VOICE:+00 000 000 0000\n" \ | ||
94 | +"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \ | ||
95 | +"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \ | ||
96 | +"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pV\n" \ | ||
97 | +" UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAFE9JREFUeJztnXmQHNV9xz\n" \ | ||
98 | +" +ve86dvU/tanUiCVwRQuaIhSEOMsIiEsbGRtiVGFy4EsdU4bINOICPUtkQHOxgYoiDTVJxCBiwM\n" \ | ||
99 | +" CBxBjAlsIUlEQzISAhZN5JW2l3tvbNz9JU/fu/N7CwgVquVmEr194/t7enu97p73vf9zvcbCBEi\n" \ | ||
100 | +" RIgQIUKECDH5UB/0DYwXwZv/Mh8AK3ISgBs4AwAR29oCwNwFfQBKLXY/mDucHFgf9A2EKEXZMiT\n" \ | ||
101 | +" YdtdUADff+QCA5Q/9BQB+Xk7w9a27vpxP8g0AO9J4IYA64/qOE3m/k4WQIWWGsmJI/q0fn2P+t5\n" \ | ||
102 | +" zerwFYDK0ACAgCAMsXRuCLqPDTQ7LvBgogSDY8DODWLvguQOLkv9t6Qm5+khAypMwQfiFlhkmZs\n" \ | ||
103 | +" vY/9rOzAXK59EkAEc87BDD9c99cC6CU8t7tumD/PQ0A/uCOHwF4Vm6pOWbnc20AlvIDOTnQF8nU\n" \ | ||
104 | +" hJOT3XQ/AK7jyJRWUSXHIw1vAQQV078BEJ1/7f9MwqMed4QMKTNMiCF/uP/ONgC7Y/ODAF52YCE\n" \ | ||
105 | +" ArhcBwMIDiMZiLkAsVX8fwClfvfOrALldd5wGYGe6HgRQQfpkABXxi/fjCKkCX6ihtJ6rtFAP8i\n" \ | ||
106 | +" Ny3nAfAJ4dk/OiCQBsZSn5vLoXIJ+aezVAxfxvPDCRZz5RCBlSZpgQQzbe+qXzAYLcwAMAgRM0A\n" \ | ||
107 | +" UTQ072Sf6JKmo8HWQVgNSc7AU6+YG4AELiZKXITIic8gsL92J5uyzXixzBGbx1tIA73yIMkK2Vr\n" \ | ||
108 | +" x/R5cg9KaXU40gCAH2//lOkjsm3WkwB97KoEyOHUA2TTw9J5U0MWwNm5rw9g3tfuzB3lqzpqhAw\n" \ | ||
109 | +" pM0QmclE0knIBvOywD+ApB4BAG2u2EmoEnnw+xEAAsODD7S0AuGLMKZRRnYRBRpMCfMMMLTNUIP\n" \ | ||
110 | +" vKc0u2WPoaSz+KbeuPPQXge8I+5XeLDAqsX5k+OnK7bwJwe50bAHLZfBWAo9v2DnfK3dnxtQCv3\n" \ | ||
111 | +" vH1WwB2TPnoWoDLLrvsXbXHY0HIkDLDhBhizzx1J4C7tXcYQAVOC4CtRYAVyKh2/DQA886ZoQAS\n" \ | ||
112 | +" VVGgaEqosTJsFEOUN8aJyNjB6JdeY+mxFZQ2qSwtQzw50c4eSJhjUW/wHwF275O+UpX1Its0w72\n" \ | ||
113 | +" 88eSPLAZwoiMfAWj1131aH3iOSUbIkDLDhBhy2me/vB9gw21XPQQQH8zcAOArmdADJ6MApp5SB0\n" \ | ||
114 | +" D1lKqS6wtjODBGuLYt/FGxJSM7fDNmglF/QRkfo2aORel5Zlvsy9NMKfbR0CLXJPZIG44n51hKP\n" \ | ||
115 | +" ncLfcp+3sknALxMunbsO5kshAwpM0yIIQaLrr3rRoD1t15ZB5AY6vx7gGhKRlxNe61oOLYto1Nf\n" \ | ||
116 | +" F2hmKE/LBTNqNVNglP3hyvyuCtfIvm/cYyqpt7Y+T2t8Y5lSuqsvEf60z4gD8MarYvVX1WibRZ/\n" \ | ||
117 | +" saHnlqOQWgFjDzFfe+60cG0KGlBkmNUC1/t9XngfQ1nTg1wDTZ9jizS3M23p4+qZz3X1ExoWy7E\n" \ | ||
118 | +" JbgXHyau1JG/0of0xbuo3A1Z97pZZ9gX3umC2gHQRkhrIAvLxeLHTbEoYYZntWbBjAr5t6HcDHr\n" \ | ||
119 | +" 73950d4DceEkCFlhmOSIWOx6LwqmYyzNdUAXrav5LiypTsVE39TwYYwE7w3yg7Rmo7RtgjMyDfX\n" \ | ||
120 | +" 2HrP7BsmGc1IU8pY8rbpsiinDItiCfEU19aLzdLZKYxJVNbtAnAq638CcMFxZIZByJAyw6TIkGD\n" \ | ||
121 | +" vc7MBvM5nNgCoYKAJINDD1dIeVxPLANGEKPirHNPSqEaNvDHMUKVbY5nbhimaIfq4r4IxVwW6uV\n" \ | ||
122 | +" EWvyf3Y2lZ0tNrdQFs3hb7KYCTaH4U4IJrb3/j/d7BZCFkSJlhUmRILuckAGKD2SYAnAwAFmL5Z\n" \ | ||
123 | +" jKZACCTFgs+OyzHs3kJLzg62S2fLxLW08ywtWyIxuRYLCG3XBGXbVV1BQCpSn2tlhWWHdVPKGIt\n" \ | ||
124 | +" MHZKiSEibfiabTXNElP5y2mNjwGoj9xywphhEDKkzDApDEnMW/YmQG7DDyS2PsBXAF7dsPNigDe\n" \ | ||
125 | +" 27msDCIzfyZZRa+mRGTExjFESzVKxkj6M1Vzwe3nCMiffr9uQ4w3V0nZzszTWWC99NDbK6E9WJg\n" \ | ||
126 | +" ttqmhC7I7KavFhxWqbAdxI5ZSjfQeThZAhZYbwCykzTKphGF904yb971UAv1l5hQPQ3uZdLZ1Jt\n" \ | ||
127 | +" KngXNT+EEuZgFVxfPgFhdUIYatkz1zrG/VYq7M5TxSFvQdlf9N22R/JSDi2rqo4L86cJprAwvl2\n" \ | ||
128 | +" L0BFW634VWKRD2yNSciQMsOkMsRg67rVVQDD69acBoCq1u73Uoeg75e6Q7xRrhO/4IfUzsPRHg+\n" \ | ||
129 | +" KLDNX+JackNTqbjwqR6qrdLBJG6X5UQGq/f362r2V1wF8tL71fwFinTM+sIz5kCFlhuPCkNxbW2\n" \ | ||
130 | +" YAJOxYG0CvttYefWUnAGfOqAfg9FbZ5rXj0LOL87uvKeIaEVHIudYukDHnKW34YRtnozxajzZCa\n" \ | ||
131 | +" 5Ki7laM0qar4non0ZoBiC/95uaJPO9kImRImeG4MCTiZWYDxJORaQDPbpTlfvslK4hUp4zas2bK\n" \ | ||
132 | +" fB9xSmULFI1EIzsK3nhvjLNRlTLH4M2DAwA8sWk/AOd9qA2AD0+rL56kU4yi5C/Wnzw47oc8Tgg\n" \ | ||
133 | +" ZUmY4LgyxLW8ugB94cYADg7mSlFETNIpoGng6dBtRxfHhaoejju7iGQYYd3spIQpamQlodQ8KC1\n" \ | ||
134 | +" 0tW/b3yf6HWopaVkVSZIibHT7l6J/y+CBkSJlhUhnyp6eeigPk9v52FkBUB6C0x5z+rIze2Y2SO\n" \ | ||
135 | +" KfGWOyj00BNwoMJapnAk9L6lTVG7JgosGFKbUq0Ks+X5QoZR6/a9YoGja95FnhOJUAQBDF9P/mj\n" \ | ||
136 | +" ffbJQsiQMsOkMiTa2akA0k5OfOCOhGaXzW8HoCct+6e31wCQ0dpVXssLNdr/ruVJoBliZIrJB1K\n" \ | ||
137 | +" 2DtkWBrz8Y3Sw2U3Cwnk66NSiA1mxaHEMKl8CaK4nnW1/+j6TiB0yJIRgUhmyZ+ZMF6Byy5ZuKO\n" \ | ||
138 | +" akTauS+Xx6jWzNqDbmhxfIuOjuOlxoK1mRAqD5zLMBmDp/AQAdL64FYHDPdgBc7ZuKxoWURitLa\n" \ | ||
139 | +" at/+fxpQHHkGc8ygGuqQyjlAsxbdvngBB6bTZs2tANYFfE5APPnLPyDOaaUGjqatkKGlBkmlSGL\n" \ | ||
140 | +" F0utqg0/ve4FAKWiVwPkA6cKIHB8naqpSuIiRvNpbGgotGVkQVWrRFNrpk4H4GC7bL0dkn8QT1S\n" \ | ||
141 | +" U3oRxZWkZFLeMbFHvcAd4nvwfj9dMaKn0s8/ffzHAa5s2rgF4fNUaABoaG3abc35868rLAK65/n\n" \ | ||
142 | +" vjStAOGVJmOC7VgFYGIhTO/+dr7gDIDXd+CSDieUmASCFzuvQu7FFtFOZ8bU3bKdHMRgYlPTWql\n" \ | ||
143 | +" 5sZJcvEO4yZkdNZEb5ehOPp4zkVKdj4qqLuBYDPfu/ujx/N8z3x9H2fkrbdVQB73z4YA3ju8acD\n" \ | ||
144 | +" gP7unsJ7bZnSlgGYffKsCwFuve3u3x6p7ZAhZYYTUi9rzc1f/i5A98G3vw9Qoxf3VyVFhMULDqv\n" \ | ||
145 | +" Rlrp8ZhVSQsdEG8fE1M3WK0QG5eysF+QAPMt+HcCJVj5i+vibW/7zNnjv4jjveI41v1gE4OFLTS\n" \ | ||
146 | +" 7sNgBli99goH9QATy3+qkCC/ds26kAmqc0DwEsXXrRJQBXX3f98+/WR8iQMsNx8fYaGN/QvXddd\n" \ | ||
147 | +" T7Azr1iAO/auQcA1xGpYevRPm9mMYktEZNYSTIqW9ss3DFMcOUaNyeDeyAt+4Pa+LF04kheW//1\n" \ | ||
148 | +" 7W3bASJnT/9X08d4mfHLX981FyDvuqKNRWyd+Ie+F6F2MiUa3+KLLixQ/Yn06gBgsKurCuB3v3v\n" \ | ||
149 | +" uh/rQGe/WV8iQMkP4hZQZjotQf+WXP28EcBP+zwCG4sGnAQb6hy2A7l1bFcCiOgmvbu8Wj8Xat4\n" \ | ||
150 | +" vFdmrrqgFIJHX1B1MVVmc9ZLK6jsqQTINbtsv+nsOy/cxZcn0kIVpBqqVOAbTHpz1m+vjKd/6tU\n" \ | ||
151 | +" Bno3fDoow9MA3C9YUkAjFp1UHT1eDrDIghMtQh94SgnaW5EVmP96r/ulRXJmXwHwA/vuvN0gIUL\n" \ | ||
152 | +" z+ka3WfIkDLDMTHk9f++NgUQT0eaAEac3JUAvV2Hvg6wr3egGmD3iIzqs5b/FQCREUnrPCsiAy+\n" \ | ||
153 | +" bl1F0y7qBQttVzbLUpLJCC/WoKACONghHRoQJ+3d1A9CxR5gyNCLH/3yOFB46c34rANs6DwYAFf\n" \ | ||
154 | +" 3FRSgNze1vAcSTkRsAalMtUrZ8SnsGwG+s3ghgRW0p6myq22nXj6etUM8kXhgaB6MWoUTFy9nXI\n" \ | ||
155 | +" UR45uHHfgTw9Avr/+GdbzRkSNlhQmrvlv/49gyA6NDw7QD5bN8lAP6weJrNiLeaWgKAzte3K4C8\n" \ | ||
156 | +" /v47B2UARdNSN3HJKcKCl94qEna7Tua0IibZQa6Ja89HhTYYG4fkeI1OfqhNySO98baEbrd3Sr5\n" \ | ||
157 | +" odVRmgznVscLojXXvPwUgn0isBhipEpbVTm0GQNutONoLalnWEWeUIChlEICn1fDmltbV8N7MMA\n" \ | ||
158 | +" gZUmYYN0N2r/1Foc5Udstr3wIg138JQKATCNxAhrEKZCQ5VlIBXLrkPACaDu0DYOfmHQAMW5I5F\n" \ | ||
159 | +" 3xY5vmVFxb7+/4a0bjmatnRpjPmDudlgL+o5VKVzmqoTsjxXp1CGtGGpakE0ZeTezw0VJQhlQlp\n" \ | ||
160 | +" O6mrGFHfqAA2bJT40vwzTpf7ntqqQ7263uOYFKRgTOZ3aWK49RiAW2t9gXEgZEiZYdwM6d38ZiE\n" \ | ||
161 | +" HM54fOgPAz4umk8nLMM27kpvpOTJENq2XmExSj5zzW8S1UN8j2lTPdAm7Zl4TO2T+1mII958qpI\n" \ | ||
162 | +" 2WKaJtDc+eAUDt1l0A/G1C2KUCGfmNmkkHtUP+qRHZf13HiWt0FQl3OF3ow6/XNX4rErJaWAe79\n" \ | ||
163 | +" u4Q+2jX9r0AXHL5ZdJ3kwTQXLO+PijZoHSuUhCo9aYP2/a/CnDF0iuKHR8BIUPKDOPXspLFUGkm\n" \ | ||
164 | +" I3Oun5XRmdajMK0ZM5AVbaVrUOTAqoyMqFPrJCUn1yo2wut/Et28tUOOVwcFMUWtkS/aYu8+YxE\n" \ | ||
165 | +" ATXtEDjVrmRBTIitSMWHEbJ1gl9d1fdf3y3k9SNtWtugNmK3lj601obgenhVVcp993aKprb53FQ\n" \ | ||
166 | +" CXXiliIFktCRieXmFkGdPcsg4CpJI115s+VnxyxdscBUKGlBnGzZDTTzqv4HN5qXfViwBZV50JM\n" \ | ||
167 | +" JyRytWDOWHI7l5JbN6ake97d81skTE1LQrg2ks/BsCT9z0NwOY+sbaXnrug0N+da34PwEU7JGQ7\n" \ | ||
168 | +" c794vndoP9Kd/RLSnabXoX9xkSTjPfuaeAEe7hdZslWZer5yXrKY7MD2nhEFUF8hsizWI9b8SXO\n" \ | ||
169 | +" mK4BX+6RvNysOtGdWP6kAPnHJ8gAgkUpqH5bqArDtxOcBVnxyxe/e80W+D0KGlBnGzRC1uPhzdC\n" \ | ||
170 | +" /+9Ns/ARgeGJgG0DGUXQLQPTB8AGBzt5SuPhhtOB3Ar2tIAGw4JMx5/hWxQ7py0v36PgnpLpozt\n" \ | ||
171 | +" 9Df7mYZ6Vcf0rlrGZMYYcK+woAfzJH9tC+y5O4D0lZXXIJdkZSMfs/8RFIuU7BDtg1k0gDVKacX\n" \ | ||
172 | +" gM7N0wDmnHlmL8CfLZwfA/jjy5sqAboPCINeenatAjh36ZJBgGgscTnAFy79whETGMaDkCFlhmP\n" \ | ||
173 | +" y9r696rYkwM+fWf95gG279n8OoLM/PRWgI8fJAJ2pKVGAkXpJeivQUntLnRHRqM6e11Zoe5tekt\n" \ | ||
174 | +" aTLy0uYIziuOQusETcTgxpL/Dve6T1IKK3+gnjfQcBaBop2jqtFXZeN5oGUL5bBzB9SuPNABd/8\n" \ | ||
175 | +" Yu/AXjt5ZcfAXjzj3+sB1BW0AfwieUXXQnwtWu+s2Ycr2tcCBlSZjgmhtz07etOAtj86saNAE5m\n" \ | ||
176 | +" pBYgl3ctAE/n6gxlZUnbznxKAfQ0zAIgSIhtYGr0Wn7RSRQoPefrytaB+XUEnSJqKlmbKkAmLcj\n" \ | ||
177 | +" Tn1s6CTvZK3bL9LyIicZUtNCJrbMrzHK5vF4EWlFVGQC0z5p1GsA55yw+AOA72cUA6ezwawDXXH\n" \ | ||
178 | +" PjrqN4XeNCyJAywzEx5IpPffwJAC+fWwaQ1dZzoNtNZyUuMqLj33kdD+90RfM5VK1/TiQqlq/yi\n" \ | ||
179 | +" pE2W7mOfOZmAGxNEU9XCAgsKwngWzrrzpKN0nHu6NBBBTAzIzZOoy6YGo0Ux2ChrKPeutpGsXW9\n" \ | ||
180 | +" 3qbW1ucBVj365JKjfzsTQ8iQMsOEIobf+PJfnwrQsXf3qQC5jKhCvv6Vm5z2ablBacVqSy8NaLI\n" \ | ||
181 | +" kUhjpk/m9XzPEihfrXiz72MduBVix5NyHAJYtW9YF8MILLzQB/OSBxy8C2LZ330UAnQNDCwGC9E\n" \ | ||
182 | +" AKoCUv2lS9DvtFDDPUaIYYQhbctvIcOu6RT4+ce3Rv5tgRMqTMEH4hZYYJTVmeE9QA+L5UqjSra\n" \ | ||
183 | +" ANLV/XxSjPSi9+7WW0rbo5qW85PepL1oLLFckCnpOxfASxfvnzLmO479XYzwLp16x4C+Ob1Nz4C\n" \ | ||
184 | +" MJTvWQCQiprqQDpLXt+Tskb9JIapYl5YA19aN8Vx8/H3exeTjZAhZYYJMSTrcxgg70uBw+IaDTn\n" \ | ||
185 | +" ujd2aWldarTSV5Fy9TtwPxECrb6j9jenj+ptuehPghptvPuK9ZLq6+gHswBUdW7PQ9WSs2VrVDm\n" \ | ||
186 | +" zzG0klY1BSQY2DZUxloVi8YkKrco8FIUPKDBNiyJeuurwD4I5bbt8IMJLubgfIZXMWjKqXaKrCm\n" \ | ||
187 | +" a1ZuK5LNtTU1h8GaG+fthLg/oceusv0oVQxkHQkXPCZz/QA3HPPPSsAnn7y8SsBeroOnwtg4y8A\n" \ | ||
188 | +" yOez8qORjluQC+YHJH1fll1F7UgOIJlK7gOYPmvubXLmpP863nsiZEiZYVKWI6xc+a2FAHv/tP1\n" \ | ||
189 | +" cgM7OzmqAwLdaARzP6QCobajrA5gza+5LALfefuJ+BsKgt7d3xtjP6urqxP2u1OF3XnFiETIkRI\n" \ | ||
190 | +" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \ | ||
191 | "END:VCARD" | ||
192 | Index: addressbook/backends/file/Makefile.am | ||
193 | =================================================================== | ||
194 | --- addressbook/backends/file/Makefile.am.orig 2011-12-19 13:58:28.954859229 +0000 | ||
195 | +++ addressbook/backends/file/Makefile.am 2011-12-19 13:58:31.442859286 +0000 | ||
196 | @@ -2,6 +2,7 @@ | ||
197 | |||
198 | libebookbackendfile_la_CPPFLAGS = \ | ||
199 | $(AM_CPPFLAGS) \ | ||
200 | + -DCREATE_DEFAULT_VCARD \ | ||
201 | -DG_LOG_DOMAIN=\"libebookbackend\" \ | ||
202 | -I$(top_srcdir) \ | ||
203 | -I$(top_builddir) \ | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch b/meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch new file mode 100644 index 0000000000..7ef2956e37 --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Do not disable old API after upgrading gtk+. | ||
2 | This avoid build error due to defination missing. | ||
3 | |||
4 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Index: git/configure.ac | ||
9 | =================================================================== | ||
10 | --- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800 | ||
11 | +++ git/configure.ac 2010-12-16 10:25:58.000000000 +0800 | ||
12 | @@ -147,7 +147,6 @@ | ||
13 | AS_COMPILER_FLAGS(WARNING_FLAGS, | ||
14 | "-DG_DISABLE_DEPRECATED | ||
15 | -DPANGO_DISABLE_DEPRECATED | ||
16 | - -DGDK_DISABLE_DEPRECATED | ||
17 | -DGDK_PIXBUF_DISABLE_DEPRECATED | ||
18 | -DG_DISABLE_SINGLE_INCLUDES | ||
19 | -DGTK_DISABLE_SINGLE_INCLUDES | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch b/meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch new file mode 100644 index 0000000000..d9b094082c --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Index: git/camel/providers/Makefile.am | ||
4 | =================================================================== | ||
5 | --- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800 | ||
6 | +++ git/camel/providers/Makefile.am 2010-07-08 17:23:56.000000000 +0800 | ||
7 | @@ -6,6 +6,10 @@ | ||
8 | IMAP4_DIR=imap4 | ||
9 | endif | ||
10 | |||
11 | +if ENABLE_IMAPX | ||
12 | +IMAPX_DIR=imapx | ||
13 | +endif | ||
14 | + | ||
15 | if ENABLE_HULA | ||
16 | HULA_DIR=hula | ||
17 | endif | ||
18 | @@ -15,6 +19,6 @@ | ||
19 | SENDMAIL_DIR=sendmail | ||
20 | endif | ||
21 | |||
22 | -SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imapx $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR) | ||
23 | +SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR) | ||
24 | |||
25 | -include $(top_srcdir)/git.mk | ||
26 | Index: git/configure.ac | ||
27 | =================================================================== | ||
28 | --- git.orig/configure.ac 2010-07-08 17:24:36.000000000 +0800 | ||
29 | +++ git/configure.ac 2010-07-08 17:32:06.000000000 +0800 | ||
30 | @@ -1002,6 +1002,26 @@ | ||
31 | AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes]) | ||
32 | |||
33 | dnl ****************************** | ||
34 | +dnl IMAPX code support. | ||
35 | +dnl ****************************** | ||
36 | +AC_ARG_ENABLE(imapx, | ||
37 | + AS_HELP_STRING([--enable-imapx=no/yes], | ||
38 | + [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]), | ||
39 | + [],[enable_imapx=no]) | ||
40 | + | ||
41 | +if test "x$enable_imapx" = "xyes"; then | ||
42 | + AC_DEFINE(ENABLE_IMAPX,1,[Really don't try this at home]) | ||
43 | + AC_PATH_PROG(GPERF, gperf) | ||
44 | + if test -z "$GPERF" ; then | ||
45 | + AC_MSG_ERROR([You need gperf to compile imapx provider]) | ||
46 | + fi | ||
47 | + msg_imapx=yes | ||
48 | +else | ||
49 | + msg_imapx=no | ||
50 | +fi | ||
51 | +AM_CONDITIONAL(ENABLE_IMAPX, [test x$enable_imapx = xyes]) | ||
52 | + | ||
53 | +dnl ****************************** | ||
54 | dnl Hula support | ||
55 | dnl ****************************** | ||
56 | AC_ARG_ENABLE([hula], | ||
57 | @@ -1541,3 +1561,7 @@ | ||
58 | if test "x$msg_hula" = "xyes"; then | ||
59 | echo "Hula support: $msg_hula" | ||
60 | fi | ||
61 | + | ||
62 | +if test "x$msg_imapx" = "xyes"; then | ||
63 | + echo "IMAPX support: $msg_imapx" | ||
64 | +fi | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch b/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch new file mode 100644 index 0000000000..ee004a9539 --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch | |||
@@ -0,0 +1,203 @@ | |||
1 | Update git.mk to the version from Pango which has parallel make fixes. | ||
2 | http://git.gnome.org/browse/pango/log/git.mk | ||
3 | commit 6118d5891fee776a087855c335a73c79fdaf036c | ||
4 | |||
5 | RP 16/3/10 | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: git/git.mk | ||
10 | =================================================================== | ||
11 | --- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000 | ||
12 | +++ git/git.mk 2010-03-16 11:30:23.000000000 +0000 | ||
13 | @@ -82,97 +82,106 @@ | ||
14 | ### .gitignore generation | ||
15 | |||
16 | $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk | ||
17 | - @echo Generating $@; \ | ||
18 | - GTKDOCGITIGNOREFILES=; \ | ||
19 | - test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \ | ||
20 | - GTKDOCGITIGNOREFILES=" \ | ||
21 | - $(DOC_MODULE)-decl-list.txt \ | ||
22 | - $(DOC_MODULE)-decl.txt \ | ||
23 | - tmpl/$(DOC_MODULE)-unused.sgml \ | ||
24 | - tmpl/*.bak \ | ||
25 | - xml html \ | ||
26 | - "; \ | ||
27 | - GNOMEDOCUTILSGITIGNOREFILES=; \ | ||
28 | - test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \ | ||
29 | - GNOMEDOCUTILSGITIGNOREFILES=" \ | ||
30 | - $(_DOC_C_DOCS) \ | ||
31 | - $(_DOC_LC_DOCS) \ | ||
32 | - $(_DOC_OMF_ALL) \ | ||
33 | - $(_DOC_DSK_ALL) \ | ||
34 | - $(_DOC_HTML_ALL) \ | ||
35 | - $(_DOC_POFILES) \ | ||
36 | - */.xml2po.mo \ | ||
37 | - */*.omf.out \ | ||
38 | - "; \ | ||
39 | - INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \ | ||
40 | - INTLTOOLGITIGNOREFILES=" \ | ||
41 | - po/Makefile.in.in \ | ||
42 | - po/Makefile.in \ | ||
43 | - po/Makefile \ | ||
44 | - po/*.gmo \ | ||
45 | - po/*.mo \ | ||
46 | - po/POTFILES \ | ||
47 | - po/stamp-it \ | ||
48 | - po/.intltool-merge-cache \ | ||
49 | - intltool-extract.in \ | ||
50 | - intltool-merge.in \ | ||
51 | - intltool-update.in \ | ||
52 | - "; \ | ||
53 | - AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \ | ||
54 | - AUTOCONFGITIGNOREFILES=" \ | ||
55 | - autom4te.cache \ | ||
56 | - configure \ | ||
57 | - config.h \ | ||
58 | - stamp-h1 \ | ||
59 | - libtool \ | ||
60 | - config.lt \ | ||
61 | - "; \ | ||
62 | - for x in \ | ||
63 | - .gitignore \ | ||
64 | - $$GTKDOCGITIGNOREFILES \ | ||
65 | - $$GNOMEDOCUTILSGITIGNOREFILES \ | ||
66 | - $$INTLTOOLGITIGNOREFILES \ | ||
67 | - $$AUTOCONFGITIGNOREFILES \ | ||
68 | - $(GITIGNOREFILES) \ | ||
69 | - $(CLEANFILES) \ | ||
70 | - $(PROGRAMS) \ | ||
71 | - $(EXTRA_PROGRAMS) \ | ||
72 | - $(LTLIBRARIES) \ | ||
73 | - so_locations \ | ||
74 | - .libs _libs \ | ||
75 | - $(MOSTLYCLEANFILES) \ | ||
76 | - "*.$(OBJEXT)" \ | ||
77 | - "*.lo" \ | ||
78 | - $(DISTCLEANFILES) \ | ||
79 | - $(am__CONFIG_DISTCLEAN_FILES) \ | ||
80 | - $(CONFIG_CLEAN_FILES) \ | ||
81 | - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ | ||
82 | - "*.tab.c" \ | ||
83 | - $(MAINTAINERCLEANFILES) \ | ||
84 | - $(BUILT_SOURCES) \ | ||
85 | - $(DEPDIR) \ | ||
86 | - Makefile \ | ||
87 | - Makefile.in \ | ||
88 | - "*.orig" \ | ||
89 | - "*.rej" \ | ||
90 | - "*.bak" \ | ||
91 | - "*~" \ | ||
92 | - ".*.sw[nop]" \ | ||
93 | - ; do echo /$$x; done | \ | ||
94 | + $(AM_V_GEN) \ | ||
95 | + { \ | ||
96 | + if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ | ||
97 | + for x in \ | ||
98 | + $(DOC_MODULE)-decl-list.txt \ | ||
99 | + $(DOC_MODULE)-decl.txt \ | ||
100 | + tmpl/$(DOC_MODULE)-unused.sgml \ | ||
101 | + "tmpl/*.bak" \ | ||
102 | + xml html \ | ||
103 | + ; do echo /$$x; done; \ | ||
104 | + fi; \ | ||
105 | + if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ | ||
106 | + for x in \ | ||
107 | + $(_DOC_C_DOCS) \ | ||
108 | + $(_DOC_LC_DOCS) \ | ||
109 | + $(_DOC_OMF_ALL) \ | ||
110 | + $(_DOC_DSK_ALL) \ | ||
111 | + $(_DOC_HTML_ALL) \ | ||
112 | + $(_DOC_POFILES) \ | ||
113 | + "*/.xml2po.mo" \ | ||
114 | + "*/*.omf.out" \ | ||
115 | + ; do echo /$$x; done; \ | ||
116 | + fi; \ | ||
117 | + if test -f $(srcdir)/po/Makefile.in.in; then \ | ||
118 | + for x in \ | ||
119 | + po/Makefile.in.in \ | ||
120 | + po/Makefile.in \ | ||
121 | + po/Makefile \ | ||
122 | + po/POTFILES \ | ||
123 | + po/stamp-it \ | ||
124 | + po/.intltool-merge-cache \ | ||
125 | + "po/*.gmo" \ | ||
126 | + "po/*.mo" \ | ||
127 | + po/$(GETTEXT_PACKAGE).pot \ | ||
128 | + intltool-extract.in \ | ||
129 | + intltool-merge.in \ | ||
130 | + intltool-update.in \ | ||
131 | + ; do echo /$$x; done; \ | ||
132 | + fi; \ | ||
133 | + if test -f $(srcdir)/configure; then \ | ||
134 | + for x in \ | ||
135 | + autom4te.cache \ | ||
136 | + configure \ | ||
137 | + config.h \ | ||
138 | + stamp-h1 \ | ||
139 | + libtool \ | ||
140 | + config.lt \ | ||
141 | + ; do echo /$$x; done; \ | ||
142 | + fi; \ | ||
143 | + for x in \ | ||
144 | + .gitignore \ | ||
145 | + $(GITIGNOREFILES) \ | ||
146 | + $(CLEANFILES) \ | ||
147 | + $(PROGRAMS) \ | ||
148 | + $(check_PROGRAMS) \ | ||
149 | + $(EXTRA_PROGRAMS) \ | ||
150 | + $(LTLIBRARIES) \ | ||
151 | + so_locations \ | ||
152 | + .libs _libs \ | ||
153 | + $(MOSTLYCLEANFILES) \ | ||
154 | + "*.$(OBJEXT)" \ | ||
155 | + "*.lo" \ | ||
156 | + $(DISTCLEANFILES) \ | ||
157 | + $(am__CONFIG_DISTCLEAN_FILES) \ | ||
158 | + $(CONFIG_CLEAN_FILES) \ | ||
159 | + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ | ||
160 | + "*.tab.c" \ | ||
161 | + $(MAINTAINERCLEANFILES) \ | ||
162 | + $(BUILT_SOURCES) \ | ||
163 | + $(DEPDIR) \ | ||
164 | + Makefile \ | ||
165 | + Makefile.in \ | ||
166 | + "*.orig" \ | ||
167 | + "*.rej" \ | ||
168 | + "*.bak" \ | ||
169 | + "*~" \ | ||
170 | + ".*.sw[nop]" \ | ||
171 | + ; do echo /$$x; done; \ | ||
172 | + } | \ | ||
173 | sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ | ||
174 | sed 's@/[.]/@/@g' | \ | ||
175 | - LANG=C sort | uniq > $@.tmp && \ | ||
176 | + LC_ALL=C sort | uniq > $@.tmp && \ | ||
177 | mv $@.tmp $@; | ||
178 | |||
179 | -all: $(srcdir)/.gitignore gitignore-recurse | ||
180 | -gitignore-recurse: | ||
181 | +all: $(srcdir)/.gitignore gitignore-recurse-maybe | ||
182 | +gitignore-recurse-maybe: | ||
183 | @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ | ||
184 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
185 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \ | ||
186 | - done; \ | ||
187 | + $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ | ||
188 | fi; | ||
189 | +gitignore-recurse: | ||
190 | + @for subdir in $(DIST_SUBDIRS); do \ | ||
191 | + case " $(SUBDIRS) " in \ | ||
192 | + *" $$subdir "*) :;; \ | ||
193 | + *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ | ||
194 | + esac; \ | ||
195 | + done | ||
196 | +gitignore: $(srcdir)/.gitignore gitignore-recurse | ||
197 | + | ||
198 | maintainer-clean: gitignore-clean | ||
199 | gitignore-clean: | ||
200 | -rm -f $(srcdir)/.gitignore | ||
201 | -.PHONY: gitignore-clean gitignore-recurse | ||
202 | |||
203 | +.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe | ||