diff options
| author | Ross Burton <ross@openedhand.com> | 2005-10-17 18:26:45 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2005-10-17 18:26:45 +0000 |
| commit | 700c2d4e3dc4ba218134a7e16112d2073f49caf7 (patch) | |
| tree | e825bcca4cd0bdcc7298d70a909a87bc85645c4b /openembedded/packages/eds/eds-dbus | |
| parent | b65b0ded15f31639ee76b1e13d33a59eeaea8513 (diff) | |
| download | poky-700c2d4e3dc4ba218134a7e16112d2073f49caf7.tar.gz | |
Fix patches for latest SVN
git-svn-id: https://svn.o-hand.com/repos/poky@141 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/eds/eds-dbus')
| -rw-r--r-- | openembedded/packages/eds/eds-dbus/external_libdb.patch | 4 | ||||
| -rw-r--r-- | openembedded/packages/eds/eds-dbus/no_iconv_test.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch index 50b9e9b48a..635f4cb5ec 100644 --- a/openembedded/packages/eds/eds-dbus/external_libdb.patch +++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch | |||
| @@ -6,8 +6,8 @@ Index: trunk/Makefile.am | |||
| 6 | endif | 6 | endif |
| 7 | 7 | ||
| 8 | if ENABLE_DBUS | 8 | if ENABLE_DBUS |
| 9 | -SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar docs art po | 9 | -SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po |
| 10 | +SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar docs art po | 10 | +SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po |
| 11 | else | 11 | else |
| 12 | -SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po | 12 | -SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po |
| 13 | +SUBDIRS = libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po | 13 | +SUBDIRS = libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po |
diff --git a/openembedded/packages/eds/eds-dbus/no_iconv_test.patch b/openembedded/packages/eds/eds-dbus/no_iconv_test.patch index 0589bdb887..6e33c7889e 100644 --- a/openembedded/packages/eds/eds-dbus/no_iconv_test.patch +++ b/openembedded/packages/eds/eds-dbus/no_iconv_test.patch | |||
| @@ -17,7 +17,7 @@ Index: trunk/configure.in | |||
| 17 | -int main (int argc, char **argv) | 17 | -int main (int argc, char **argv) |
| 18 | -{ | 18 | -{ |
| 19 | - const char *from = "Some Text \xA4"; | 19 | - const char *from = "Some Text \xA4"; |
| 20 | - const char *utf8 = "Some Text \xE2\x82\xAC"; | 20 | - const char *utf8 = "Some Text \xC2\xA4"; |
| 21 | - char *transbuf = malloc (20), *trans = transbuf; | 21 | - char *transbuf = malloc (20), *trans = transbuf; |
| 22 | - iconv_t cd; | 22 | - iconv_t cd; |
| 23 | - size_t from_len = strlen (from), utf8_len = 20; | 23 | - size_t from_len = strlen (from), utf8_len = 20; |
| @@ -29,7 +29,7 @@ Index: trunk/configure.in | |||
| 29 | - exit (1); | 29 | - exit (1); |
| 30 | -#endif | 30 | -#endif |
| 31 | - | 31 | - |
| 32 | - cd = iconv_open ("UTF-8", "ISO_8859-15"); | 32 | - cd = iconv_open ("UTF-8", "ISO_8859-1"); |
| 33 | - if (cd == (iconv_t) -1) | 33 | - if (cd == (iconv_t) -1) |
| 34 | - exit (1); | 34 | - exit (1); |
| 35 | - if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) | 35 | - if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) |