From 32fc9a77439e2aac4392cfbba5896a007507d55f Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 8 Dec 2004 19:32:45 +0000 Subject: Fix wrong assumption on iconv args on amd64. Submitted by: Sean McNeil --- multimedia/dvdauthor/Makefile | 2 +- multimedia/dvdauthor/files/patch-readxml.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 multimedia/dvdauthor/files/patch-readxml.c diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index 1123d5d5b29..f6890f7ea0c 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvdauthor PORTVERSION= 0.6.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/dvdauthor/files/patch-readxml.c b/multimedia/dvdauthor/files/patch-readxml.c new file mode 100644 index 00000000000..9c022018774 --- /dev/null +++ b/multimedia/dvdauthor/files/patch-readxml.c @@ -0,0 +1,21 @@ +--- src/readxml.c.orig Fri Mar 12 23:57:39 2004 ++++ src/readxml.c Sun Dec 5 20:19:28 2004 +@@ -221,13 +221,13 @@ + char *utf8tolocal(const char *in) + { + iconv_t c=get_conv(); +- int inlen=strlen(in); +- int outlen=inlen*5; ++ size_t inlen=strlen(in); ++ size_t outlen=inlen*5; + char *r=malloc(outlen+1); + char *out=r; +- int v; ++ size_t v; + +- v=iconv(c,ICONV_CAST &in,&inlen,&out,&outlen); ++ v=iconv(c,&in,&inlen,&out,&outlen); + if(v==-1) { + fprintf(stderr,"ERR: Cannot convert UTF8 string '%s': %s\n",in,strerror(errno)); + exit(1); + -- cgit