diff options
| author | pb <pb@FreeBSD.org> | 2004-12-09 03:32:45 +0800 |
|---|---|---|
| committer | pb <pb@FreeBSD.org> | 2004-12-09 03:32:45 +0800 |
| commit | 32fc9a77439e2aac4392cfbba5896a007507d55f (patch) | |
| tree | fb714cd35ed0a1df25cf7786eb5eca74afc6fca4 | |
| parent | 4a55e7acf6a81097e54303fd853ccf740538afb8 (diff) | |
| download | freebsd-ports-graphics-32fc9a77439e2aac4392cfbba5896a007507d55f.tar.gz freebsd-ports-graphics-32fc9a77439e2aac4392cfbba5896a007507d55f.tar.zst freebsd-ports-graphics-32fc9a77439e2aac4392cfbba5896a007507d55f.zip | |
Fix wrong assumption on iconv args on amd64.
Submitted by: Sean McNeil <sean@mcneil.com>
| -rw-r--r-- | multimedia/dvdauthor/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/dvdauthor/files/patch-readxml.c | 21 |
2 files changed, 22 insertions, 1 deletions
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); + |