1 files changed, 9 insertions, 22 deletions
diff --git a/testing/deadbeef/deadbeef-junklib.patch b/testing/deadbeef/deadbeef-junklib.patch
index 948ce88deb..63a29ca938 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