Fix patches for latest SVN
git-svn-id: https://svn.o-hand.com/repos/poky@141 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
b65b0ded15
commit
700c2d4e3d
|
@ -6,8 +6,8 @@ Index: trunk/Makefile.am
|
|||
endif
|
||||
|
||||
if ENABLE_DBUS
|
||||
-SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar docs art po
|
||||
+SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar docs art po
|
||||
-SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po
|
||||
+SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po
|
||||
else
|
||||
-SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
|
||||
+SUBDIRS = libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
|
||||
|
|
|
@ -17,7 +17,7 @@ Index: trunk/configure.in
|
|||
-int main (int argc, char **argv)
|
||||
-{
|
||||
- const char *from = "Some Text \xA4";
|
||||
- const char *utf8 = "Some Text \xE2\x82\xAC";
|
||||
- const char *utf8 = "Some Text \xC2\xA4";
|
||||
- char *transbuf = malloc (20), *trans = transbuf;
|
||||
- iconv_t cd;
|
||||
- size_t from_len = strlen (from), utf8_len = 20;
|
||||
|
@ -29,7 +29,7 @@ Index: trunk/configure.in
|
|||
- exit (1);
|
||||
-#endif
|
||||
-
|
||||
- cd = iconv_open ("UTF-8", "ISO_8859-15");
|
||||
- cd = iconv_open ("UTF-8", "ISO_8859-1");
|
||||
- if (cd == (iconv_t) -1)
|
||||
- exit (1);
|
||||
- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0)
|
||||
|
|
|
@ -4,7 +4,7 @@ RDEPENDS = "gtk+ gconf db libiconv"
|
|||
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
||||
DESCRIPTION = "Evolution database backend server"
|
||||
PV = "1.4.0cvs${CVSDATE}"
|
||||
PR = "r8"
|
||||
PR = "r9"
|
||||
|
||||
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
|
||||
file://external_libdb.patch;patch=1 \
|
||||
|
|
Loading…
Reference in New Issue