diff options
| author | joerg <joerg> | 2017-02-14 21:25:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2017-02-14 21:25:50 +0000 |
| commit | 8be3d8b1cbff74e47cc1a29e7bbec81f2cceadf0 (patch) | |
| tree | e4896cf11d1a32649cf551b70abd3ab73801fe59 /multimedia | |
| parent | b107af6b5d2b24253e225c5627d74aa118183e17 (diff) | |
| download | pkgsrc-8be3d8b1cbff74e47cc1a29e7bbec81f2cceadf0.tar.gz | |
Fix iconv error handling. Bump revision.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/fuppes/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/fuppes/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/fuppes/patches/patch-src_lib_Common_Common.cpp | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile index 57c0f56ae92..649ee8d2045 100644 --- a/multimedia/fuppes/Makefile +++ b/multimedia/fuppes/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2017/01/16 23:45:13 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2017/02/14 21:25:50 joerg Exp $ DISTNAME= fuppes-0.660 -PKGREVISION= 30 +PKGREVISION= 31 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/} diff --git a/multimedia/fuppes/distinfo b/multimedia/fuppes/distinfo index b1804da2b7d..c6ce27c5883 100644 --- a/multimedia/fuppes/distinfo +++ b/multimedia/fuppes/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:24 agc Exp $ +$NetBSD: distinfo,v 1.9 2017/02/14 21:25:50 joerg Exp $ SHA1 (fuppes-0.660.tar.gz) = ca729343754e0d775fb8291fda8b3ac64ef64df2 RMD160 (fuppes-0.660.tar.gz) = 4a1f278fd4cb00d80ce2efae57201aaa73d11840 SHA512 (fuppes-0.660.tar.gz) = 36076f57fb0c7266b392f1fc0949de5422dcc1533cb6e2d5e09698f36b0b734bfd063396c5574c7446641f9de6b2589ccf8979f5ce4b04c7a97fe1928a7e49ec Size (fuppes-0.660.tar.gz) = 685373 bytes SHA1 (patch-include_fuppes__plugin.h) = bfe692659f2b2033c5acf197845c3adfc9ed516f -SHA1 (patch-src_lib_Common_Common.cpp) = c9f1cfd036c9e5b95065bd28d75c497edfbfe32f +SHA1 (patch-src_lib_Common_Common.cpp) = 740b88bbcfc4333d7b3b957d963be65152ef3282 SHA1 (patch-src_lib_HTTP_HTTPParser.cpp) = ddc3feba5a0d381dd2896f18943a946b556f2812 SHA1 (patch-src_plugins_database__sqlite3.cpp) = 99408f855d5d0f09d8b620785022a205a7c1f621 SHA1 (patch-src_plugins_metadata__libavformat.c) = a66c05432d6a12beca47f8f2d496b522655b2159 diff --git a/multimedia/fuppes/patches/patch-src_lib_Common_Common.cpp b/multimedia/fuppes/patches/patch-src_lib_Common_Common.cpp index cdc3dce8e50..a3e72a96533 100644 --- a/multimedia/fuppes/patches/patch-src_lib_Common_Common.cpp +++ b/multimedia/fuppes/patches/patch-src_lib_Common_Common.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-src_lib_Common_Common.cpp,v 1.1 2013/04/30 22:34:31 joerg Exp $ +$NetBSD: patch-src_lib_Common_Common.cpp,v 1.2 2017/02/14 21:25:50 joerg Exp $ ---- src/lib/Common/Common.cpp.orig 2013-04-30 12:37:10.000000000 +0000 +--- src/lib/Common/Common.cpp.orig 2009-12-20 20:26:29.000000000 +0000 +++ src/lib/Common/Common.cpp @@ -38,6 +38,7 @@ @@ -10,3 +10,12 @@ $NetBSD: patch-src_lib_Common_Common.cpp,v 1.1 2013/04/30 22:34:31 joerg Exp $ #endif #include <sys/stat.h> #include <sys/types.h> +@@ -466,7 +467,7 @@ std::string ToUTF8(std::string p_sValue, + icv = iconv_open("UTF-8", p_sEncoding.c_str()); + } + +- if(icv < 0) ++ if(icv == (iconv_t)-1) + return p_sValue; + + size_t nInbytes = p_sValue.length(); |