summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/eds
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/eds')
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch215
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch32
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch97
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch39
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch77
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h5
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb112
7 files changed, 577 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
new file mode 100644
index 000000000..b77e7b9bd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
@@ -0,0 +1,215 @@
1From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 4 Aug 2013 09:13:25 +0200
4Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something
5 more appropriate
6
7Upstream-Status: Inappropriate [configuration]
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 addressbook/backends/file/Makefile.am | 1 +
11 addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
12 2 files changed, 103 insertions(+), 77 deletions(-)
13
14diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
15index 08cf58f..17e7149 100644
16--- a/addressbook/backends/file/Makefile.am
17+++ b/addressbook/backends/file/Makefile.am
18@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la
19
20 libebookbackendfile_la_CPPFLAGS = \
21 $(AM_CPPFLAGS) \
22+ -DCREATE_DEFAULT_VCARD \
23 -DG_LOG_DOMAIN=\"libebookbackend\" \
24 -I$(top_srcdir) \
25 -I$(top_builddir) \
26diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h
27index 782d37b..5b0b250 100644
28--- a/addressbook/libedata-book/ximian-vcard.h
29+++ b/addressbook/libedata-book/ximian-vcard.h
30@@ -1,80 +1,105 @@
31 #define XIMIAN_VCARD \
32 "BEGIN:VCARD\n" \
33-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
34-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
35-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
36-"TEL;WORK;VOICE:(617) 613-2000\n" \
37-"TEL;WORK;FAX:(617) 613-2001\n" \
38-"EMAIL;INTERNET:hello@ximian.com\n" \
39-"URL:http://www.ximian.com/\n" \
40-"ORG:Novell;Ximian Group\n" \
41-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \
42-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \
43-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \
44-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \
45-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \
46-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \
47-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \
48-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \
49-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \
50-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \
51-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \
52-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \
53-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \
54-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \
55-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \
56-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \
57-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \
58-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \
59-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \
60-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \
61-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \
62-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \
63-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \
64-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \
65-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \
66-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \
67-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \
68-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \
69-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \
70-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \
71-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \
72-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \
73-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \
74-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \
75-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \
76-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \
77-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \
78-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \
79-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \
80-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \
81-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \
82-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \
83-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \
84-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \
85-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \
86-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \
87-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \
88-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \
89-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \
90-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \
91-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \
92-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \
93-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \
94-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \
95-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \
96-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \
97-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \
98-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \
99-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \
100-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \
101-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \
102-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \
103-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \
104-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \
105-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \
106-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \
107-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \
108-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \
109-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \
110+"VERSION:3.0\n" \
111+"FN:Yocto Project\n" \
112+"URL:http://www.yoctoproject.org/\n" \
113+"EMAIL:yocto@yoctoproject.org\n" \
114+"TEL;TYPE=VOICE:+00 000 000 0000\n" \
115+"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \
116+"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \
117+"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pV\n" \
118+" UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAFE9JREFUeJztnXmQHNV9xz\n" \
119+" +ve86dvU/tanUiCVwRQuaIhSEOMsIiEsbGRtiVGFy4EsdU4bINOICPUtkQHOxgYoiDTVJxCBiwM\n" \
120+" CBxBjAlsIUlEQzISAhZN5JW2l3tvbNz9JU/fu/N7CwgVquVmEr194/t7enu97p73vf9zvcbCBEi\n" \
121+" RIgQIUKECDH5UB/0DYwXwZv/Mh8AK3ISgBs4AwAR29oCwNwFfQBKLXY/mDucHFgf9A2EKEXZMiT\n" \
122+" YdtdUADff+QCA5Q/9BQB+Xk7w9a27vpxP8g0AO9J4IYA64/qOE3m/k4WQIWWGsmJI/q0fn2P+t5\n" \
123+" zerwFYDK0ACAgCAMsXRuCLqPDTQ7LvBgogSDY8DODWLvguQOLkv9t6Qm5+khAypMwQfiFlhkmZs\n" \
124+" vY/9rOzAXK59EkAEc87BDD9c99cC6CU8t7tumD/PQ0A/uCOHwF4Vm6pOWbnc20AlvIDOTnQF8nU\n" \
125+" hJOT3XQ/AK7jyJRWUSXHIw1vAQQV078BEJ1/7f9MwqMed4QMKTNMiCF/uP/ONgC7Y/ODAF52YCE\n" \
126+" ArhcBwMIDiMZiLkAsVX8fwClfvfOrALldd5wGYGe6HgRQQfpkABXxi/fjCKkCX6ihtJ6rtFAP8i\n" \
127+" Ny3nAfAJ4dk/OiCQBsZSn5vLoXIJ+aezVAxfxvPDCRZz5RCBlSZpgQQzbe+qXzAYLcwAMAgRM0A\n" \
128+" UTQ072Sf6JKmo8HWQVgNSc7AU6+YG4AELiZKXITIic8gsL92J5uyzXixzBGbx1tIA73yIMkK2Vr\n" \
129+" x/R5cg9KaXU40gCAH2//lOkjsm3WkwB97KoEyOHUA2TTw9J5U0MWwNm5rw9g3tfuzB3lqzpqhAw\n" \
130+" pM0QmclE0knIBvOywD+ApB4BAG2u2EmoEnnw+xEAAsODD7S0AuGLMKZRRnYRBRpMCfMMMLTNUIP\n" \
131+" vKc0u2WPoaSz+KbeuPPQXge8I+5XeLDAqsX5k+OnK7bwJwe50bAHLZfBWAo9v2DnfK3dnxtQCv3\n" \
132+" vH1WwB2TPnoWoDLLrvsXbXHY0HIkDLDhBhizzx1J4C7tXcYQAVOC4CtRYAVyKh2/DQA886ZoQAS\n" \
133+" VVGgaEqosTJsFEOUN8aJyNjB6JdeY+mxFZQ2qSwtQzw50c4eSJhjUW/wHwF275O+UpX1Its0w72\n" \
134+" 88eSPLAZwoiMfAWj1131aH3iOSUbIkDLDhBhy2me/vB9gw21XPQQQH8zcAOArmdADJ6MApp5SB0\n" \
135+" D1lKqS6wtjODBGuLYt/FGxJSM7fDNmglF/QRkfo2aORel5Zlvsy9NMKfbR0CLXJPZIG44n51hKP\n" \
136+" ncLfcp+3sknALxMunbsO5kshAwpM0yIIQaLrr3rRoD1t15ZB5AY6vx7gGhKRlxNe61oOLYto1Nf\n" \
137+" F2hmKE/LBTNqNVNglP3hyvyuCtfIvm/cYyqpt7Y+T2t8Y5lSuqsvEf60z4gD8MarYvVX1WibRZ/\n" \
138+" saHnlqOQWgFjDzFfe+60cG0KGlBkmNUC1/t9XngfQ1nTg1wDTZ9jizS3M23p4+qZz3X1ExoWy7E\n" \
139+" JbgXHyau1JG/0of0xbuo3A1Z97pZZ9gX3umC2gHQRkhrIAvLxeLHTbEoYYZntWbBjAr5t6HcDHr\n" \
140+" 73950d4DceEkCFlhmOSIWOx6LwqmYyzNdUAXrav5LiypTsVE39TwYYwE7w3yg7Rmo7RtgjMyDfX\n" \
141+" 2HrP7BsmGc1IU8pY8rbpsiinDItiCfEU19aLzdLZKYxJVNbtAnAq638CcMFxZIZByJAyw6TIkGD\n" \
142+" vc7MBvM5nNgCoYKAJINDD1dIeVxPLANGEKPirHNPSqEaNvDHMUKVbY5nbhimaIfq4r4IxVwW6uV\n" \
143+" EWvyf3Y2lZ0tNrdQFs3hb7KYCTaH4U4IJrb3/j/d7BZCFkSJlhUmRILuckAGKD2SYAnAwAFmL5Z\n" \
144+" jKZACCTFgs+OyzHs3kJLzg62S2fLxLW08ywtWyIxuRYLCG3XBGXbVV1BQCpSn2tlhWWHdVPKGIt\n" \
145+" MHZKiSEibfiabTXNElP5y2mNjwGoj9xywphhEDKkzDApDEnMW/YmQG7DDyS2PsBXAF7dsPNigDe\n" \
146+" 27msDCIzfyZZRa+mRGTExjFESzVKxkj6M1Vzwe3nCMiffr9uQ4w3V0nZzszTWWC99NDbK6E9WJg\n" \
147+" ttqmhC7I7KavFhxWqbAdxI5ZSjfQeThZAhZYbwCykzTKphGF904yb971UAv1l5hQPQ3uZdLZ1Jt\n" \
148+" KngXNT+EEuZgFVxfPgFhdUIYatkz1zrG/VYq7M5TxSFvQdlf9N22R/JSDi2rqo4L86cJprAwvl2\n" \
149+" L0BFW634VWKRD2yNSciQMsOkMsRg67rVVQDD69acBoCq1u73Uoeg75e6Q7xRrhO/4IfUzsPRHg+\n" \
150+" KLDNX+JackNTqbjwqR6qrdLBJG6X5UQGq/f362r2V1wF8tL71fwFinTM+sIz5kCFlhuPCkNxbW2\n" \
151+" YAJOxYG0CvttYefWUnAGfOqAfg9FbZ5rXj0LOL87uvKeIaEVHIudYukDHnKW34YRtnozxajzZCa\n" \
152+" 5Ki7laM0qar4non0ZoBiC/95uaJPO9kImRImeG4MCTiZWYDxJORaQDPbpTlfvslK4hUp4zas2bK\n" \
153+" fB9xSmULFI1EIzsK3nhvjLNRlTLH4M2DAwA8sWk/AOd9qA2AD0+rL56kU4yi5C/Wnzw47oc8Tgg\n" \
154+" ZUmY4LgyxLW8ugB94cYADg7mSlFETNIpoGng6dBtRxfHhaoejju7iGQYYd3spIQpamQlodQ8KC1\n" \
155+" 0tW/b3yf6HWopaVkVSZIibHT7l6J/y+CBkSJlhUhnyp6eeigPk9v52FkBUB6C0x5z+rIze2Y2SO\n" \
156+" KfGWOyj00BNwoMJapnAk9L6lTVG7JgosGFKbUq0Ks+X5QoZR6/a9YoGja95FnhOJUAQBDF9P/mj\n" \
157+" ffbJQsiQMsOkMiTa2akA0k5OfOCOhGaXzW8HoCct+6e31wCQ0dpVXssLNdr/ruVJoBliZIrJB1K\n" \
158+" 2DtkWBrz8Y3Sw2U3Cwnk66NSiA1mxaHEMKl8CaK4nnW1/+j6TiB0yJIRgUhmyZ+ZMF6Byy5ZuKO\n" \
159+" akTauS+Xx6jWzNqDbmhxfIuOjuOlxoK1mRAqD5zLMBmDp/AQAdL64FYHDPdgBc7ZuKxoWURitLa\n" \
160+" at/+fxpQHHkGc8ygGuqQyjlAsxbdvngBB6bTZs2tANYFfE5APPnLPyDOaaUGjqatkKGlBkmlSGL\n" \
161+" F0utqg0/ve4FAKWiVwPkA6cKIHB8naqpSuIiRvNpbGgotGVkQVWrRFNrpk4H4GC7bL0dkn8QT1S\n" \
162+" U3oRxZWkZFLeMbFHvcAd4nvwfj9dMaKn0s8/ffzHAa5s2rgF4fNUaABoaG3abc35868rLAK65/n\n" \
163+" vjStAOGVJmOC7VgFYGIhTO/+dr7gDIDXd+CSDieUmASCFzuvQu7FFtFOZ8bU3bKdHMRgYlPTWql\n" \
164+" 5sZJcvEO4yZkdNZEb5ehOPp4zkVKdj4qqLuBYDPfu/ujx/N8z3x9H2fkrbdVQB73z4YA3ju8acD\n" \
165+" gP7unsJ7bZnSlgGYffKsCwFuve3u3x6p7ZAhZYYTUi9rzc1f/i5A98G3vw9Qoxf3VyVFhMULDqv\n" \
166+" Rlrp8ZhVSQsdEG8fE1M3WK0QG5eysF+QAPMt+HcCJVj5i+vibW/7zNnjv4jjveI41v1gE4OFLTS\n" \
167+" 7sNgBli99goH9QATy3+qkCC/ds26kAmqc0DwEsXXrRJQBXX3f98+/WR8iQMsNx8fYaGN/QvXddd\n" \
168+" T7Azr1iAO/auQcA1xGpYevRPm9mMYktEZNYSTIqW9ss3DFMcOUaNyeDeyAt+4Pa+LF04kheW//1\n" \
169+" 7W3bASJnT/9X08d4mfHLX981FyDvuqKNRWyd+Ie+F6F2MiUa3+KLLixQ/Yn06gBgsKurCuB3v3v\n" \
170+" uh/rQGe/WV8iQMkP4hZQZjotQf+WXP28EcBP+zwCG4sGnAQb6hy2A7l1bFcCiOgmvbu8Wj8Xat4\n" \
171+" vFdmrrqgFIJHX1B1MVVmc9ZLK6jsqQTINbtsv+nsOy/cxZcn0kIVpBqqVOAbTHpz1m+vjKd/6tU\n" \
172+" Bno3fDoow9MA3C9YUkAjFp1UHT1eDrDIghMtQh94SgnaW5EVmP96r/ulRXJmXwHwA/vuvN0gIUL\n" \
173+" z+ka3WfIkDLDMTHk9f++NgUQT0eaAEac3JUAvV2Hvg6wr3egGmD3iIzqs5b/FQCREUnrPCsiAy+\n" \
174+" bl1F0y7qBQttVzbLUpLJCC/WoKACONghHRoQJ+3d1A9CxR5gyNCLH/3yOFB46c34rANs6DwYAFf\n" \
175+" 3FRSgNze1vAcSTkRsAalMtUrZ8SnsGwG+s3ghgRW0p6myq22nXj6etUM8kXhgaB6MWoUTFy9nXI\n" \
176+" UR45uHHfgTw9Avr/+GdbzRkSNlhQmrvlv/49gyA6NDw7QD5bN8lAP6weJrNiLeaWgKAzte3K4C8\n" \
177+" /v47B2UARdNSN3HJKcKCl94qEna7Tua0IibZQa6Ja89HhTYYG4fkeI1OfqhNySO98baEbrd3Sr5\n" \
178+" odVRmgznVscLojXXvPwUgn0isBhipEpbVTm0GQNutONoLalnWEWeUIChlEICn1fDmltbV8N7MMA\n" \
179+" gZUmYYN0N2r/1Foc5Udstr3wIg138JQKATCNxAhrEKZCQ5VlIBXLrkPACaDu0DYOfmHQAMW5I5F\n" \
180+" 3xY5vmVFxb7+/4a0bjmatnRpjPmDudlgL+o5VKVzmqoTsjxXp1CGtGGpakE0ZeTezw0VJQhlQlp\n" \
181+" O6mrGFHfqAA2bJT40vwzTpf7ntqqQ7263uOYFKRgTOZ3aWK49RiAW2t9gXEgZEiZYdwM6d38ZiE\n" \
182+" HM54fOgPAz4umk8nLMM27kpvpOTJENq2XmExSj5zzW8S1UN8j2lTPdAm7Zl4TO2T+1mII958qpI\n" \
183+" 2WKaJtDc+eAUDt1l0A/G1C2KUCGfmNmkkHtUP+qRHZf13HiWt0FQl3OF3ow6/XNX4rErJaWAe79\n" \
184+" u4Q+2jX9r0AXHL5ZdJ3kwTQXLO+PijZoHSuUhCo9aYP2/a/CnDF0iuKHR8BIUPKDOPXspLFUGkm\n" \
185+" I3Oun5XRmdajMK0ZM5AVbaVrUOTAqoyMqFPrJCUn1yo2wut/Et28tUOOVwcFMUWtkS/aYu8+YxE\n" \
186+" ATXtEDjVrmRBTIitSMWHEbJ1gl9d1fdf3y3k9SNtWtugNmK3lj601obgenhVVcp993aKprb53FQ\n" \
187+" CXXiliIFktCRieXmFkGdPcsg4CpJI115s+VnxyxdscBUKGlBnGzZDTTzqv4HN5qXfViwBZV50JM\n" \
188+" JyRytWDOWHI7l5JbN6ake97d81skTE1LQrg2ks/BsCT9z0NwOY+sbaXnrug0N+da34PwEU7JGQ7\n" \
189+" c794vndoP9Kd/RLSnabXoX9xkSTjPfuaeAEe7hdZslWZer5yXrKY7MD2nhEFUF8hsizWI9b8SXO\n" \
190+" mK4BX+6RvNysOtGdWP6kAPnHJ8gAgkUpqH5bqArDtxOcBVnxyxe/e80W+D0KGlBnGzRC1uPhzdC\n" \
191+" /+9Ns/ARgeGJgG0DGUXQLQPTB8AGBzt5SuPhhtOB3Ar2tIAGw4JMx5/hWxQ7py0v36PgnpLpozt\n" \
192+" 9Df7mYZ6Vcf0rlrGZMYYcK+woAfzJH9tC+y5O4D0lZXXIJdkZSMfs/8RFIuU7BDtg1k0gDVKacX\n" \
193+" gM7N0wDmnHlmL8CfLZwfA/jjy5sqAboPCINeenatAjh36ZJBgGgscTnAFy79whETGMaDkCFlhmP\n" \
194+" y9r696rYkwM+fWf95gG279n8OoLM/PRWgI8fJAJ2pKVGAkXpJeivQUntLnRHRqM6e11Zoe5tekt\n" \
195+" aTLy0uYIziuOQusETcTgxpL/Dve6T1IKK3+gnjfQcBaBop2jqtFXZeN5oGUL5bBzB9SuPNABd/8\n" \
196+" Yu/AXjt5ZcfAXjzj3+sB1BW0AfwieUXXQnwtWu+s2Ycr2tcCBlSZjgmhtz07etOAtj86saNAE5m\n" \
197+" pBYgl3ctAE/n6gxlZUnbznxKAfQ0zAIgSIhtYGr0Wn7RSRQoPefrytaB+XUEnSJqKlmbKkAmLcj\n" \
198+" Tn1s6CTvZK3bL9LyIicZUtNCJrbMrzHK5vF4EWlFVGQC0z5p1GsA55yw+AOA72cUA6ezwawDXXH\n" \
199+" PjrqN4XeNCyJAywzEx5IpPffwJAC+fWwaQ1dZzoNtNZyUuMqLj33kdD+90RfM5VK1/TiQqlq/yi\n" \
200+" pE2W7mOfOZmAGxNEU9XCAgsKwngWzrrzpKN0nHu6NBBBTAzIzZOoy6YGo0Ux2ChrKPeutpGsXW9\n" \
201+" 3qbW1ucBVj365JKjfzsTQ8iQMsOEIobf+PJfnwrQsXf3qQC5jKhCvv6Vm5z2ablBacVqSy8NaLI\n" \
202+" kUhjpk/m9XzPEihfrXiz72MduBVix5NyHAJYtW9YF8MILLzQB/OSBxy8C2LZ330UAnQNDCwGC9E\n" \
203+" AKoCUv2lS9DvtFDDPUaIYYQhbctvIcOu6RT4+ce3Rv5tgRMqTMEH4hZYYJTVmeE9QA+L5UqjSra\n" \
204+" ANLV/XxSjPSi9+7WW0rbo5qW85PepL1oLLFckCnpOxfASxfvnzLmO479XYzwLp16x4C+Ob1Nz4C\n" \
205+" MJTvWQCQiprqQDpLXt+Tskb9JIapYl5YA19aN8Vx8/H3exeTjZAhZYYJMSTrcxgg70uBw+IaDTn\n" \
206+" ujd2aWldarTSV5Fy9TtwPxECrb6j9jenj+ptuehPghptvPuK9ZLq6+gHswBUdW7PQ9WSs2VrVDm\n" \
207+" zzG0klY1BSQY2DZUxloVi8YkKrco8FIUPKDBNiyJeuurwD4I5bbt8IMJLubgfIZXMWjKqXaKrCm\n" \
208+" a1ZuK5LNtTU1h8GaG+fthLg/oceusv0oVQxkHQkXPCZz/QA3HPPPSsAnn7y8SsBeroOnwtg4y8A\n" \
209+" yOez8qORjluQC+YHJH1fll1F7UgOIJlK7gOYPmvubXLmpP863nsiZEiZYVKWI6xc+a2FAHv/tP1\n" \
210+" cgM7OzmqAwLdaARzP6QCobajrA5gza+5LALfefuJ+BsKgt7d3xtjP6urqxP2u1OF3XnFiETIkRI\n" \
211+" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \
212 "END:VCARD"
213--
2141.8.3.2
215
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
new file mode 100644
index 000000000..5f222aeaa
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
@@ -0,0 +1,32 @@
1From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Sun, 4 Aug 2013 09:15:43 +0200
4Subject: [PATCH 2/5] Fix for automake-1.12.x
5
6Fixed these kinds if warning-errors
7
8warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
9
10Upstream-Status: Pending
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 configure.ac | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/configure.ac b/configure.ac
19index 9bd97db..49d7506 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -31,6 +31,7 @@ AC_LANG(C)
23
24 dnl Automake 1.11 - Silent Build Rules
25 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
26+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
27
28 dnl Required Package Versions
29 m4_define([glib_minimum_version], [2.28])
30--
311.8.3.2
32
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
new file mode 100644
index 000000000..a182d4d5e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
@@ -0,0 +1,97 @@
1From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Sun, 4 Aug 2013 09:16:59 +0200
4Subject: [PATCH 3/5] Disable Werror for automake
5
6Avoid these warning-errors
7
8automake: warnings are treated as errors
9Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
10Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
11addressbook/backends/file/Makefile.am: installing './depcomp'
12addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
13addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
14addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
15addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
16addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
17addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension
18addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name
19addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension)
20glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
21addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
22glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
23addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
24glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
25addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
26glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
27addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
28glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
29addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
30glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
31addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
32addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension
33addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
34calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension
35calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension
36calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension
37calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name
38calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
39calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension
40calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name
41calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension)
42glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
43calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
44glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
45calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
46glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
47calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
48glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
49calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
50glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
51calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
52glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
53calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
54calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension
55calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
56camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension
57libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension
58libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
59libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension
60libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
61libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension
62libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
63servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension
64servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
65servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension
66servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
67servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension
68servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
69autoreconf: automake failed with exit status: 1
70
71Upstream-Status: Inappropriate [embedded specific]
72
73Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
74Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
75
76Conflicts:
77 configure.ac
78---
79 configure.ac | 2 +-
80 1 file changed, 1 insertion(+), 1 deletion(-)
81
82diff --git a/configure.ac b/configure.ac
83index 49d7506..1c802ff 100644
84--- a/configure.ac
85+++ b/configure.ac
86@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
87 dnl Autoconf / Automake Initialization
88 AC_PREREQ(2.62)
89 AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
90-AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign])
91+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
92 AC_CONFIG_MACRO_DIR([m4])
93 AC_CONFIG_SRCDIR(README)
94 AC_CONFIG_HEADERS(config.h)
95--
961.8.3.2
97
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
new file mode 100644
index 000000000..138334798
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
@@ -0,0 +1,39 @@
1From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 4 Aug 2013 10:57:08 +0200
4Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
5 paths
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 calendar/libecal/libecal.pc.in | 2 +-
10 configure.ac | 3 ++-
11 2 files changed, 3 insertions(+), 2 deletions(-)
12
13diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
14index fc6b359..d3435bb 100644
15--- a/calendar/libecal/libecal.pc.in
16+++ b/calendar/libecal/libecal.pc.in
17@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
18 Version: @VERSION@
19 Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
20 Libs: -L${libdir} -lecal-1.2
21-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
22+Cflags: -I${privincludedir}
23diff --git a/configure.ac b/configure.ac
24index 1c802ff..f1d4ce8 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
28 dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
29 dnl libical is fixed, we have to work-around the buggy CFlags.
30 dnl *****
31- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
32+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
33+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
34 LIBICAL_EXTRA_LIBS=""
35 AC_SUBST(LIBICAL_EXTRA_CFLAGS)
36 AC_SUBST(LIBICAL_EXTRA_LIBS)
37--
381.8.3.2
39
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
new file mode 100644
index 000000000..addf2ee8d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
@@ -0,0 +1,77 @@
1From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 27 Nov 2012 08:46:51 +0100
4Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0
5
6* for more info see
7 https://mail.gnome.org/archives/xml/2012-August/msg00005.html
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
12 1 file changed, 21 insertions(+)
13
14diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
15index 12f8f22..5555a3e 100644
16--- a/calendar/backends/caldav/e-cal-backend-caldav.c
17+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
18@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
19 soup_message_set_request (message,
20 "application/xml",
21 SOUP_MEMORY_COPY,
22+#ifdef LIBXML2_NEW_BUFFER
23+ (gchar *) xmlOutputBufferGetContent(buf),
24+ xmlOutputBufferGetSize(buf));
25+#else
26 (gchar *) buf->buffer->content,
27 buf->buffer->use);
28+#endif
29
30 /* Send the request now */
31 send_and_handle_redirection (priv->session, message, NULL);
32@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
33 soup_message_set_request (message,
34 "application/xml",
35 SOUP_MEMORY_COPY,
36+#ifdef LIBXML2_NEW_BUFFER
37+ (gchar *) xmlOutputBufferGetContent(buf),
38+ xmlOutputBufferGetSize(buf));
39+#else
40 (gchar *) buf->buffer->content,
41 buf->buffer->use);
42+#endif
43
44 /* Send the request now */
45 send_and_handle_redirection (priv->session, message, NULL);
46@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
47 soup_message_set_request (message,
48 "application/xml",
49 SOUP_MEMORY_COPY,
50+#ifdef LIBXML2_NEW_BUFFER
51+ (gchar *) xmlOutputBufferGetContent(buf),
52+ xmlOutputBufferGetSize(buf));
53+#else
54 (gchar *) buf->buffer->content,
55 buf->buffer->use);
56+#endif
57+
58
59 /* Send the request now */
60 send_and_handle_redirection (priv->session, message, NULL);
61@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
62 soup_message_set_request (message,
63 "application/xml",
64 SOUP_MEMORY_COPY,
65+#ifdef LIBXML2_NEW_BUFFER
66+ (gchar *) xmlOutputBufferGetContent(buf),
67+ xmlOutputBufferGetSize(buf));
68+#else
69 (gchar *) buf->buffer->content,
70 buf->buffer->use);
71+#endif
72
73 /* Send the request now */
74 send_and_handle_redirection (priv->session, message, NULL);
75--
761.8.3.2
77
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
new file mode 100644
index 000000000..46f476d5b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/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-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
new file mode 100644
index 000000000..7c935a3d5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
@@ -0,0 +1,112 @@
1SUMMARY = "Evolution database backend server"
2HOMEPAGE = "http://www.gnome.org/projects/evolution/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2 & LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
7 file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
8 file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \
9 file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
10
11DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss"
12
13SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
14
15# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
16PV = "3.2.3+git${SRCPV}"
17
18SRC_URI = " \
19 git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
20 file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
21 file://0002-Fix-for-automake-1.12.x.patch \
22 file://0003-Disable-Werror-for-automake.patch \
23 file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
24 file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
25 file://iconv-detect.h \
26"
27
28S = "${WORKDIR}/git"
29
30inherit autotools gtk-doc pkgconfig gettext
31
32# -ldb needs this on some platforms
33LDFLAGS += "-lpthread"
34
35# Parallel make shows many issues with this source code.
36# Current problems seem to be duplicate execution of the calander/backends
37# directories by make resulting in truncated/corrupt .la files
38#PARALLEL_MAKE = ""
39
40do_configure_append () {
41 cp ${WORKDIR}/iconv-detect.h ${S}
42}
43
44EXTRA_OECONF = "--without-openldap \
45 --with-libdb=${STAGING_DIR_HOST}${prefix} \
46 --disable-nntp --disable-goa --disable-weather"
47
48PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
49 libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
50 libedataserver libedataserver-dev \
51 libedataserverui libedataserverui-dev"
52
53FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
54FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
55FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
56 ${libdir}/evolution-data-server*/calendar-backends/.debug \
57 ${libdir}/evolution-data-server*/addressbook-backends/.debug \
58 ${libdir}/evolution-data-server*/extensions/.debug/"
59
60RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
61
62FILES_libcamel = "${libdir}/libcamel-*.so.* \
63 ${libdir}/libcamel-provider-*.so.* \
64 ${libdir}/evolution-data-server*/camel-providers/*.so \
65 ${libdir}/evolution-data-server*/camel-providers/*.urls"
66FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
67 ${libdir}/pkgconfig/camel*pc \
68 ${libdir}/evolution-data-server*/camel-providers/*.la \
69 ${includedir}/evolution-data-server*/camel"
70
71FILES_libebook = "${libdir}/libebook-*.so.*"
72FILES_libebook-dev = "${libdir}/libebook-1.2.so \
73 ${libdir}/pkgconfig/libebook-*.pc \
74 ${includedir}/evolution-data-server*/libebook/*.h"
75RRECOMMENDS_libebook = "libedata-book"
76
77FILES_libecal = "${libdir}/libecal-*.so.* \
78 ${datadir}/evolution-data-server-1.4/zoneinfo"
79FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
80 ${includedir}/evolution-data-server*/libecal/*.h \
81 ${includedir}/evolution-data-server*/libical/*.h"
82RRECOMMENDS_libecal = "libedata-cal tzdata"
83
84FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
85 ${datadir}/dbus-1/services/*.AddressBook.service \
86 ${libdir}/libedata-book-*.so.* \
87 ${libdir}/evolution-data-server-*/extensions/libebook*.so \
88 ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
89FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
90 ${libdir}/pkgconfig/libedata-book-*.pc \
91 ${libdir}/evolution-data-server-*/extensions/libebook*.la \
92 ${includedir}/evolution-data-server-*/libedata-book"
93
94FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
95 ${datadir}/dbus-1/services/*.Calendar.service \
96 ${libdir}/libedata-cal-*.so.* \
97 ${libdir}/evolution-data-server-*/extensions/libecal*.so"
98FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
99 ${libdir}/pkgconfig/libedata-cal-*.pc \
100 ${includedir}/evolution-data-server-*/libedata-cal \
101 ${libdir}/evolution-data-server-*/extensions/libecal*.la"
102
103FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
104FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
105 ${libdir}/pkgconfig/libedataserver-*.pc \
106 ${includedir}/evolution-data-server-*/libedataserver/*.h"
107
108FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
109FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
110 ${libdir}/pkgconfig/libedataserverui-*.pc \
111 ${includedir}/evolution-data-server-*/libedataserverui/*.h"
112