diff options
| author | arved <arved@FreeBSD.org> | 2009-03-03 06:31:20 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2009-03-03 06:31:20 +0800 |
| commit | bf99eeee217eb538dc9cdda740c1b8000da3ea52 (patch) | |
| tree | c98a9246c9d8a13504c032464a5d53d0262a9228 | |
| parent | e3bf2c4598c63f21b65c6a6cf3ae976af1570283 (diff) | |
| download | freebsd-ports-gnome-bf99eeee217eb538dc9cdda740c1b8000da3ea52.tar.gz freebsd-ports-gnome-bf99eeee217eb538dc9cdda740c1b8000da3ea52.tar.zst freebsd-ports-gnome-bf99eeee217eb538dc9cdda740c1b8000da3ea52.zip | |
Fix a call to iconv_open
PR: 132267
Submitted by: Tim Borgeaud
| -rw-r--r-- | multimedia/kaffeine/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/kaffeine/files/patch-dvbsection.cpp | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 2ba787d34bc0..89db54ab7d96 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -6,7 +6,7 @@ PORTNAME= kaffeine PORTVERSION= 0.8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kaffeine diff --git a/multimedia/kaffeine/files/patch-dvbsection.cpp b/multimedia/kaffeine/files/patch-dvbsection.cpp index b3c9b6cec5fd..386e14e359ab 100644 --- a/multimedia/kaffeine/files/patch-dvbsection.cpp +++ b/multimedia/kaffeine/files/patch-dvbsection.cpp @@ -1,6 +1,6 @@ --- kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp.orig 2008-01-30 22:22:36.000000000 +0100 +++ kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp 2008-01-30 22:26:23.000000000 +0100 -@@ -134,7 +134,8 @@ +@@ -134,13 +134,14 @@ bool KaffeineDVBsection::doIconv( QCString &s, QCString table, char *buffer, int buflen ) { size_t inSize, outSize=buflen; @@ -10,6 +10,13 @@ iconv_t cd; inSize = s.length(); + if ( inSize<1 ) + return false; +- cd = iconv_open( "UTF8", table ); ++ cd = iconv_open( "UTF-8", table ); + inBuf = s.data(); + outBuf = buffer; + outBuf[0] = 0; @@ -230,7 +231,8 @@ char c[4]; QString s; |