summaryrefslogtreecommitdiff
path: root/multimedia/dvdauthor
diff options
context:
space:
mode:
authorPierre Beyssac <pb@FreeBSD.org>2004-12-08 19:32:45 +0000
committerPierre Beyssac <pb@FreeBSD.org>2004-12-08 19:32:45 +0000
commit573f9ae62cfe6f4601ceb5ce4462bd53a66ee343 (patch)
tree5033ce73b3db1464759c2f37e4612d1fb5efdc8e /multimedia/dvdauthor
parent- Make the library actually usable on gcc 3.4 systems: (diff)
Fix wrong assumption on iconv args on amd64.
Submitted by: Sean McNeil <sean@mcneil.com>
Notes
Notes: svn path=/head/; revision=123482
Diffstat (limited to 'multimedia/dvdauthor')
-rw-r--r--multimedia/dvdauthor/Makefile2
-rw-r--r--multimedia/dvdauthor/files/patch-readxml.c21
2 files changed, 22 insertions, 1 deletions
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 1123d5d5b299..f6890f7ea0c4 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 000000000000..9c022018774a
--- /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);
+