diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-05-14 18:09:57 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-05-14 18:09:57 -0500 |
| commit | 810161c34aa0f5f6d38f6509cf2a03a31953383b (patch) | |
| tree | 4da44761b101bee1704d958385539299824c391c /testing/deadbeef/deadbeef-junklib.patch | |
| parent | a63a6be997d59b0a8bdadd3c1d1441c691d5e3ae (diff) | |
| download | aports-810161c34aa0f5f6d38f6509cf2a03a31953383b.tar.bz2 aports-810161c34aa0f5f6d38f6509cf2a03a31953383b.tar.xz | |
testing/deadbeef: upgrade to 0.5.0_rc1
Diffstat (limited to 'testing/deadbeef/deadbeef-junklib.patch')
| -rw-r--r-- | testing/deadbeef/deadbeef-junklib.patch | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/testing/deadbeef/deadbeef-junklib.patch b/testing/deadbeef/deadbeef-junklib.patch index 948ce88de..63a29ca93 100644 --- a/testing/deadbeef/deadbeef-junklib.patch +++ b/testing/deadbeef/deadbeef-junklib.patch @@ -1,23 +1,10 @@ ---- deadbeef-0.4.4.orig/junklib.c -+++ deadbeef-0.4.4/junklib.c -@@ -155,7 +155,7 @@ - int - junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out) { +--- deadbeef-0.5.0-rc1.orig/junklib.c ++++ deadbeef-0.5.0-rc1/junklib.c +@@ -23,7 +23,6 @@ + #include <stdlib.h> + #include <string.h> #if HAVE_ICONV -- iconv_t cd = iconv_open (cs_out, cs_in); -+ iconv_t cd = libiconv_open (cs_out, cs_in); - if (cd == (iconv_t)-1) { - return -1; - } -@@ -171,9 +171,9 @@ - char *pout = out; - memset (out, 0, outbytesleft); - -- size_t res = iconv (cd, &pin, &inbytesleft, &pout, &outbytesleft); -+ size_t res = libiconv (cd, &pin, &inbytesleft, &pout, &outbytesleft); - int err = errno; -- iconv_close (cd); -+ libiconv_close (cd); - - //trace ("iconv -f %s -t %s '%s': returned %d, inbytes %d/%d, outbytes %d/%d, errno=%d\n", cs_in, cs_out, in, res, inlen, inbytesleft, outlen, outbytesleft, err); - if (res == -1) { +- #define LIBICONV_PLUG + #include <iconv.h> + #elif HAVE_ICU + #warning icu |