summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/eds/eds-dbus
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/eds/eds-dbus')
-rw-r--r--meta/recipes-sato/eds/eds-dbus/iconv-detect.h5
-rw-r--r--meta/recipes-sato/eds/eds-dbus/nossl.patch68
-rw-r--r--meta/recipes-sato/eds/eds-dbus/oh-contact.patch134
-rw-r--r--meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch62
-rw-r--r--meta/recipes-sato/eds/eds-dbus/parallelmake.patch201
5 files changed, 470 insertions, 0 deletions
diff --git a/meta/recipes-sato/eds/eds-dbus/iconv-detect.h b/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
new file mode 100644
index 0000000000..46f476d5bc
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/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/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch
new file mode 100644
index 0000000000..30568ff075
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch
@@ -0,0 +1,68 @@
1Index: git/camel/Makefile.am
2===================================================================
3--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
4+++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000
5@@ -80,7 +80,6 @@
6 camel-store-summary.c \
7 camel-store.c \
8 camel-tcp-stream-raw.c \
9- camel-tcp-stream-ssl.c \
10 camel-tcp-stream.c \
11 camel-transport.c \
12 camel-uid-cache.c \
13@@ -133,7 +132,6 @@
14 camel-store-summary.h \
15 camel-store.h \
16 camel-tcp-stream-raw.h \
17- camel-tcp-stream-ssl.h \
18 camel-tcp-stream.h \
19 camel-transport.h \
20 camel-uid-cache.h \
21Index: git/camel/camel.h
22===================================================================
23--- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000
24+++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000
25@@ -122,7 +122,6 @@
26 #include <camel/camel-string-utils.h>
27 #include <camel/camel-tcp-stream.h>
28 #include <camel/camel-tcp-stream-raw.h>
29-#include <camel/camel-tcp-stream-ssl.h>
30 #include <camel/camel-text-index.h>
31 #include <camel/camel-transport.h>
32 #include <camel/camel-trie.h>
33Index: git/camel/providers/imap/camel-imap-store.c
34===================================================================
35--- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000
36+++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
37@@ -51,7 +51,6 @@
38 #include "camel/camel-stream.h"
39 #include "camel/camel-string-utils.h"
40 #include "camel/camel-tcp-stream-raw.h"
41-#include "camel/camel-tcp-stream-ssl.h"
42 #include "camel/camel-url.h"
43 #include "camel/camel-utf8.h"
44
45Index: git/configure.ac
46===================================================================
47--- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000
48+++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000
49@@ -1272,7 +1272,8 @@
50 dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
51 dnl libical is fixed, we have to work-around the buggy CFlags.
52 dnl *****
53- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
54+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
55+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
56 LIBICAL_EXTRA_LIBS=""
57 AC_SUBST(LIBICAL_EXTRA_CFLAGS)
58 AC_SUBST(LIBICAL_EXTRA_LIBS)
59Index: git/calendar/libecal/libecal.pc.in
60===================================================================
61--- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000
62+++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000
63@@ -12,4 +12,4 @@
64 Version: @VERSION@
65 Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
66 Libs: -L${libdir} -lecal-1.2
67-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
68+Cflags: -I${privincludedir}
diff --git a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
new file mode 100644
index 0000000000..fdd7e4bdfb
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
@@ -0,0 +1,134 @@
1Index: addressbook/libedata-book/ximian-vcard.h
2===================================================================
3--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
4+++ addressbook/libedata-book/ximian-vcard.h 2010-02-05 14:58:14.000000000 +0000
5@@ -1,80 +1,40 @@
6 #define XIMIAN_VCARD \
7 "BEGIN:VCARD\n" \
8-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
9-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
10-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
11-"TEL;WORK;VOICE:(617) 613-2000\n" \
12-"TEL;WORK;FAX:(617) 613-2001\n" \
13-"EMAIL;INTERNET:hello@ximian.com\n" \
14-"URL:http://www.ximian.com/\n" \
15-"ORG:Novell;Ximian Group\n" \
16-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \
17-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \
18-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \
19-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \
20-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \
21-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \
22-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \
23-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \
24-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \
25-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \
26-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \
27-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \
28-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \
29-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \
30-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \
31-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \
32-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \
33-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \
34-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \
35-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \
36-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \
37-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \
38-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \
39-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \
40-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \
41-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \
42-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \
43-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \
44-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \
45-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \
46-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \
47-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \
48-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \
49-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \
50-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \
51-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \
52-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \
53-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \
54-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \
55-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \
56-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \
57-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \
58-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \
59-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \
60-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \
61-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \
62-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \
63-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \
64-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \
65-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \
66-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \
67-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \
68-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \
69-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \
70-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \
71-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \
72-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \
73-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \
74-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \
75-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \
76-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \
77-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \
78-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \
79-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \
80-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \
81-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \
82-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \
83-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \
84-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \
85+"VERSION:3.0\n" \
86+"FN:OpenedHand Ltd\n" \
87+"URL:http://www.o-hand.com/\n" \
88+"EMAIL:info@openedhand.com\n" \
89+"TEL;TYPE=VOICE:+44 208 819 6559\n" \
90+"ADR;TYPE=WORK:;216 - 218 Homesdale Road;Unit R\, Homesdale Business Center;\n" \
91+" Bromley;;BR1 2QZ;United Kingdom\n" \
92+"LABEL:Unit R, Homesdale Business Center\\n216 - 218 Homesdale Road\\nBromley\\nBR1 2QZ\\nUnited Kingdom\n" \
93+"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAC0AAAA\n" \
94+" wCAYAAACFUvPfAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOCwAADgsBOfdp+wAAABl0RVh\n" \
95+" 0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVWSURBVGiB7ZltiBVVGMd/c93d1DQ\n" \
96+" lStMSBHsRj2/ZelY0lbCIIrQgg8pKqI4gKEkSabZiUhlSmpYvxxKxVxSL9KMf1qRSZ0UTPRm\n" \
97+" KWIoviCSo2/qy3tOHmdXZufN69yp98P/l3pnzf/7P/56Ze84zzzjWWqQWI4AFwDDgKLASWOo\n" \
98+" qYwlAajHS5w1N4Y0BPgQGAUeAz11llhNCiPc3sMRVZlWYF0ZBalEH/AKMBboCA4BPgfdDCeq\n" \
99+" ArcDoEO+9CCMNwEifJ4BlUov6FN5AQEst3kk17f/SDhFjb0ktegWO43hvSy3uCBwv8HXDeFd\n" \
100+" qcXvg+KMYXr3Uokua6eExYx3wbpdWxPGqWsekFoVQTJj3oM+rAR6K4dUAQ+Ite6aTflXXwPc\n" \
101+" kXrdAwlsy6HUGqjPmLUHU5fnf46bpG4Wbpm8UqiqkUye1qAJsKrMCqJTpNyqkkwmZbg+pRac\n" \
102+" K5auITqppqcWjwL5KJAO+lFrMJLocyIy022MOXsEThyPAQeAkcAq4DbgLuAcYDDghfidgITC\n" \
103+" 5DK9XkWY6yvAxYDXwg6vM73GBfrE1AXgJr5JL082MPH/Es3iV2SJXmeY0sqvMCWAFsEJqMd6\n" \
104+" P7V+WyxCyrtONwABXmQ+yGA7DVWYjXqG/NG9sFLKY/gYY4ypzrD2JXGVaXGWmA68Cl9ujlWZ\n" \
105+" 6E/Cyq8yF9iQJwlVmNTCtPRpJpvcBL7rKFNuTIAquMiuBkmfGrIgzbfFm+FxWoVpd2zln7hn\n" \
106+" AXzljgPjVY52rzO604LpVg56CKy9Y69QW4F6pB552HNtYtHZzlxM9P2uY29ASF+sqc1FqMQf\n" \
107+" 4Oq/puJmujzkPQK3u103qAWusLW6y1nkeuA9wwN5pLU86OIuaep3aIVeJtPX4W8BUwvROV5k\n" \
108+" D8YZrqwt03ALOKynaw7BO4/Dl/R+II/j9knXZrF5DlOkfkwIcmmfjNWsywHZyqjqsfW69k1R\n" \
109+" r/JRN6xqiTG+OI8tlg/o4kNpMaQOLPHxmwGtxw64ye4B/8khGmT4am7/6yiiSH/0j4cCYFMq\n" \
110+" RPHph05fxqrW49HENmzTENXBacTyPWAG4FDhuStpMHOvcnUc8gN4p42fziBXwauFWdJdadIx\n" \
111+" lO3ZPHvFrcexNYfRKGW+DAqWXJmE2bWMe8atRsCuFkusKFoAToXOxNW/V+XO/gnM4TwKgWCg\n" \
112+" Wv4sblFp0BvrkESxQOgtPx5F/m3G0ueCVltlbBZZPdkzZvy2B8RjJTcsSFChd3Mf7LdtIbFf\n" \
113+" 7GizMI4NxCw1nLl2ak0KbkG6zLQquMnuBQ4FzPYCJSUGNyszDKT4SiguiybFM36n+GHdw2sG\n" \
114+" LcTpSix7As7lN+5/rQ+fn+x2jWLiv7//51pp/B2LtWMc6b1rHWQt2PtYZX6Sl744pZqnFpl2\n" \
115+" NelJ60VFoNfYxMBWvBQBe1TYVWJIU3DD58AW89zBb8yaWWghA5Y0Df6ZdZU7j9SOCWCi1GF2\n" \
116+" OaBqkFt3xCrPcJQG03cYX0XbNrgE2SC36lW+vFP77lu/xrmZZcGzgtvPfJ26h7RJ0GpjoKrO\n" \
117+" l3CQB/Z7ABmBUCnUBENx9zwO7XGWOl5j2hScBX4VEWoDZwGJXmbIe/6UW44A1eC2zclAEFgM\n" \
118+" zS0z7CeYA8yMCDwGzgA1Zn9KlFoPxZu6JMs2GEW3aTzYJ+ILo3eok3qa0ETgAnHSVOS+1qAZ\n" \
119+" 64s3m48AzpLwTLAN/xpr2jY/AuwfTSkuAZqAjpZ3SSuNsYofJVWY7cD8wF+/PkIROXH/DALs\n" \
120+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
121+" ArmsGAAAAAElFTkSuQmCC\n" \
122 "END:VCARD"
123Index: addressbook/backends/file/Makefile.am
124===================================================================
125--- addressbook/backends/file/Makefile.am.orig 2010-02-05 14:57:14.000000000 +0000
126+++ addressbook/backends/file/Makefile.am 2010-02-05 14:59:10.000000000 +0000
127@@ -2,6 +2,7 @@
128
129 libebookbackendfile_la_CPPFLAGS = \
130 $(AM_CPPFLAGS) \
131+ -DCREATE_DEFAULT_VCARD \
132 -DG_LOG_DOMAIN=\"libebookbackend\" \
133 -I$(top_srcdir) \
134 -I$(top_builddir) \
diff --git a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
new file mode 100644
index 0000000000..128307a5f2
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
@@ -0,0 +1,62 @@
1Index: git/camel/providers/Makefile.am
2===================================================================
3--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
4+++ git/camel/providers/Makefile.am 2010-07-08 17:23:56.000000000 +0800
5@@ -6,6 +6,10 @@
6 IMAP4_DIR=imap4
7 endif
8
9+if ENABLE_IMAPX
10+IMAPX_DIR=imapx
11+endif
12+
13 if ENABLE_HULA
14 HULA_DIR=hula
15 endif
16@@ -15,6 +19,6 @@
17 SENDMAIL_DIR=sendmail
18 endif
19
20-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imapx $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
21+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
22
23 -include $(top_srcdir)/git.mk
24Index: git/configure.ac
25===================================================================
26--- git.orig/configure.ac 2010-07-08 17:24:36.000000000 +0800
27+++ git/configure.ac 2010-07-08 17:32:06.000000000 +0800
28@@ -1002,6 +1002,26 @@
29 AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes])
30
31 dnl ******************************
32+dnl IMAPX code support.
33+dnl ******************************
34+AC_ARG_ENABLE(imapx,
35+ AS_HELP_STRING([--enable-imapx=no/yes],
36+ [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),
37+ [],[enable_imapx=no])
38+
39+if test "x$enable_imapx" = "xyes"; then
40+ AC_DEFINE(ENABLE_IMAPX,1,[Really don't try this at home])
41+ AC_PATH_PROG(GPERF, gperf)
42+ if test -z "$GPERF" ; then
43+ AC_MSG_ERROR([You need gperf to compile imapx provider])
44+ fi
45+ msg_imapx=yes
46+else
47+ msg_imapx=no
48+fi
49+AM_CONDITIONAL(ENABLE_IMAPX, [test x$enable_imapx = xyes])
50+
51+dnl ******************************
52 dnl Hula support
53 dnl ******************************
54 AC_ARG_ENABLE([hula],
55@@ -1541,3 +1561,7 @@
56 if test "x$msg_hula" = "xyes"; then
57 echo "Hula support: $msg_hula"
58 fi
59+
60+if test "x$msg_imapx" = "xyes"; then
61+ echo "IMAPX support: $msg_imapx"
62+fi
diff --git a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
new file mode 100644
index 0000000000..08cfac0d83
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
@@ -0,0 +1,201 @@
1Update git.mk to the version from Pango which has parallel make fixes.
2http://git.gnome.org/browse/pango/log/git.mk
3commit 6118d5891fee776a087855c335a73c79fdaf036c
4
5RP 16/3/10
6
7Index: git/git.mk
8===================================================================
9--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
10+++ git/git.mk 2010-03-16 11:30:23.000000000 +0000
11@@ -82,97 +82,106 @@
12 ### .gitignore generation
13
14 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
15- @echo Generating $@; \
16- GTKDOCGITIGNOREFILES=; \
17- test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
18- GTKDOCGITIGNOREFILES=" \
19- $(DOC_MODULE)-decl-list.txt \
20- $(DOC_MODULE)-decl.txt \
21- tmpl/$(DOC_MODULE)-unused.sgml \
22- tmpl/*.bak \
23- xml html \
24- "; \
25- GNOMEDOCUTILSGITIGNOREFILES=; \
26- test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
27- GNOMEDOCUTILSGITIGNOREFILES=" \
28- $(_DOC_C_DOCS) \
29- $(_DOC_LC_DOCS) \
30- $(_DOC_OMF_ALL) \
31- $(_DOC_DSK_ALL) \
32- $(_DOC_HTML_ALL) \
33- $(_DOC_POFILES) \
34- */.xml2po.mo \
35- */*.omf.out \
36- "; \
37- INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
38- INTLTOOLGITIGNOREFILES=" \
39- po/Makefile.in.in \
40- po/Makefile.in \
41- po/Makefile \
42- po/*.gmo \
43- po/*.mo \
44- po/POTFILES \
45- po/stamp-it \
46- po/.intltool-merge-cache \
47- intltool-extract.in \
48- intltool-merge.in \
49- intltool-update.in \
50- "; \
51- AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
52- AUTOCONFGITIGNOREFILES=" \
53- autom4te.cache \
54- configure \
55- config.h \
56- stamp-h1 \
57- libtool \
58- config.lt \
59- "; \
60- for x in \
61- .gitignore \
62- $$GTKDOCGITIGNOREFILES \
63- $$GNOMEDOCUTILSGITIGNOREFILES \
64- $$INTLTOOLGITIGNOREFILES \
65- $$AUTOCONFGITIGNOREFILES \
66- $(GITIGNOREFILES) \
67- $(CLEANFILES) \
68- $(PROGRAMS) \
69- $(EXTRA_PROGRAMS) \
70- $(LTLIBRARIES) \
71- so_locations \
72- .libs _libs \
73- $(MOSTLYCLEANFILES) \
74- "*.$(OBJEXT)" \
75- "*.lo" \
76- $(DISTCLEANFILES) \
77- $(am__CONFIG_DISTCLEAN_FILES) \
78- $(CONFIG_CLEAN_FILES) \
79- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
80- "*.tab.c" \
81- $(MAINTAINERCLEANFILES) \
82- $(BUILT_SOURCES) \
83- $(DEPDIR) \
84- Makefile \
85- Makefile.in \
86- "*.orig" \
87- "*.rej" \
88- "*.bak" \
89- "*~" \
90- ".*.sw[nop]" \
91- ; do echo /$$x; done | \
92+ $(AM_V_GEN) \
93+ { \
94+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
95+ for x in \
96+ $(DOC_MODULE)-decl-list.txt \
97+ $(DOC_MODULE)-decl.txt \
98+ tmpl/$(DOC_MODULE)-unused.sgml \
99+ "tmpl/*.bak" \
100+ xml html \
101+ ; do echo /$$x; done; \
102+ fi; \
103+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
104+ for x in \
105+ $(_DOC_C_DOCS) \
106+ $(_DOC_LC_DOCS) \
107+ $(_DOC_OMF_ALL) \
108+ $(_DOC_DSK_ALL) \
109+ $(_DOC_HTML_ALL) \
110+ $(_DOC_POFILES) \
111+ "*/.xml2po.mo" \
112+ "*/*.omf.out" \
113+ ; do echo /$$x; done; \
114+ fi; \
115+ if test -f $(srcdir)/po/Makefile.in.in; then \
116+ for x in \
117+ po/Makefile.in.in \
118+ po/Makefile.in \
119+ po/Makefile \
120+ po/POTFILES \
121+ po/stamp-it \
122+ po/.intltool-merge-cache \
123+ "po/*.gmo" \
124+ "po/*.mo" \
125+ po/$(GETTEXT_PACKAGE).pot \
126+ intltool-extract.in \
127+ intltool-merge.in \
128+ intltool-update.in \
129+ ; do echo /$$x; done; \
130+ fi; \
131+ if test -f $(srcdir)/configure; then \
132+ for x in \
133+ autom4te.cache \
134+ configure \
135+ config.h \
136+ stamp-h1 \
137+ libtool \
138+ config.lt \
139+ ; do echo /$$x; done; \
140+ fi; \
141+ for x in \
142+ .gitignore \
143+ $(GITIGNOREFILES) \
144+ $(CLEANFILES) \
145+ $(PROGRAMS) \
146+ $(check_PROGRAMS) \
147+ $(EXTRA_PROGRAMS) \
148+ $(LTLIBRARIES) \
149+ so_locations \
150+ .libs _libs \
151+ $(MOSTLYCLEANFILES) \
152+ "*.$(OBJEXT)" \
153+ "*.lo" \
154+ $(DISTCLEANFILES) \
155+ $(am__CONFIG_DISTCLEAN_FILES) \
156+ $(CONFIG_CLEAN_FILES) \
157+ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
158+ "*.tab.c" \
159+ $(MAINTAINERCLEANFILES) \
160+ $(BUILT_SOURCES) \
161+ $(DEPDIR) \
162+ Makefile \
163+ Makefile.in \
164+ "*.orig" \
165+ "*.rej" \
166+ "*.bak" \
167+ "*~" \
168+ ".*.sw[nop]" \
169+ ; do echo /$$x; done; \
170+ } | \
171 sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
172 sed 's@/[.]/@/@g' | \
173- LANG=C sort | uniq > $@.tmp && \
174+ LC_ALL=C sort | uniq > $@.tmp && \
175 mv $@.tmp $@;
176
177-all: $(srcdir)/.gitignore gitignore-recurse
178-gitignore-recurse:
179+all: $(srcdir)/.gitignore gitignore-recurse-maybe
180+gitignore-recurse-maybe:
181 @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
182- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
183- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
184- done; \
185+ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
186 fi;
187+gitignore-recurse:
188+ @for subdir in $(DIST_SUBDIRS); do \
189+ case " $(SUBDIRS) " in \
190+ *" $$subdir "*) :;; \
191+ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
192+ esac; \
193+ done
194+gitignore: $(srcdir)/.gitignore gitignore-recurse
195+
196 maintainer-clean: gitignore-clean
197 gitignore-clean:
198 -rm -f $(srcdir)/.gitignore
199-.PHONY: gitignore-clean gitignore-recurse
200
201+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 08:27:45 +0000