add patches for libofa and libtunepipe due to remove curl/types.h in new curl

svn path=/nixpkgs/trunk/; revision=30261

3 files changed, 251 insertions, 178 deletions

diff --git a/pkgs/development/libraries/libofa/curl-types.patch b/pkgs/development/libraries/libofa/curl-types.patch
new file mode 100644
index 000000000000..acd8d9aeabb8
--- /dev/null
+++ b/pkgs/development/libraries/libofa/curl-types.patch
@@ -0,0 +1,13 @@
+diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp
+*** libofa-0.9.3/examples/protocol.cpp	2006-05-10 14:05:42.000000000 -0400
+--- libofa-0.9.3-new/examples/protocol.cpp	2011-11-06 09:24:05.653283203 -0500
+***************
+*** 12,18 ****
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+- #include <curl/types.h>
+  #include <curl/easy.h>
+  
+  using namespace std;
+--- 12,17 ----
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 437726d6976f..6b1ceee40f1c 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ expat curl fftw ];
 
-  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ];
+  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ];
 
   src = fetchurl {
     url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
index 92219ea6f9ba..aed742b04902 100644
--- a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
+++ b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
@@ -1,177 +1,237 @@
-diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
-index f9bab5d..ea08cf5 100644
---- a/include/tunepimp-0.5/metadata.h
-+++ b/include/tunepimp-0.5/metadata.h
-@@ -29,6 +29,7 @@
- 
- #include <string>
- #include <cstdio>
-+#include <cstring>
- 
- #include "defs.h"
- #include "tp_c.h"
-diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
-index 760cc08..66c6111 100644
---- a/lib/c_wrapper.cpp
-+++ b/lib/c_wrapper.cpp
-@@ -43,6 +43,7 @@
-                          if (obj == NULL) return;
- 
- #include <deque>
-+#include <cstdlib>
- 
- class NotifyData
- {
-diff --git a/lib/fileio.cpp b/lib/fileio.cpp
-index a1602da..abe2b24 100644
---- a/lib/fileio.cpp
-+++ b/lib/fileio.cpp
-@@ -27,6 +27,8 @@
- 
- #include <assert.h>
- #include <errno.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include <string>
- #ifndef WIN32
- #include <unistd.h>
-@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
- 
- void tmktempname(const char *path, char *newPath, int newPathLen)
- {
--    char *ptr, *temp;
-+    char *temp;
-+	const char *ptr;
- 
-     temp = (char *)malloc(strlen(path) + 32);
-     ptr = strrchr(path, dirSepChar);
-diff --git a/lib/metadata.cpp b/lib/metadata.cpp
-index 0a1a70a..dcd0aa1 100644
---- a/lib/metadata.cpp
-+++ b/lib/metadata.cpp
-@@ -24,8 +24,9 @@
-    $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
- 
- ----------------------------------------------------------------------------*/
--#include <math.h>
--#include <stdio.h>
-+#include <cmath>
-+#include <cstdio>
-+#include <cstdlib>
- #include "metadata.h"
- #include "../config.h"
- using namespace std;
-diff --git a/lib/protocol.cpp b/lib/protocol.cpp
-index 83e8b33..3436f80 100644
---- a/lib/protocol.cpp
-+++ b/lib/protocol.cpp
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <string>
- #include <map>
- #include <expat.h>
-diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp
-index 7f325de..5e5513a 100644
---- a/lib/readmeta.cpp
-+++ b/lib/readmeta.cpp
-@@ -30,7 +30,8 @@
- #endif
- #endif
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp
-index bf09383..f1b9b56 100644
---- a/lib/tunepimp.cpp
-+++ b/lib/tunepimp.cpp
-@@ -30,7 +30,8 @@
- #endif
- #endif
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
- #include <map>
- using namespace std;
- 
-diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp
-index a066956..6ea86e4 100644
---- a/lib/utf8/utf8util.cpp
-+++ b/lib/utf8/utf8util.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "utf8util.h"
- #include "utf8.h"
- #ifdef WIN32
-diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp
-index fa9a7e0..efac1c9 100644
---- a/plugins/mp3/id3_2_3_meta.cpp
-+++ b/plugins/mp3/id3_2_3_meta.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <assert.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp
-index d860bf6..804ca5c 100644
---- a/plugins/mp3/id3_meta.cpp
-+++ b/plugins/mp3/id3_meta.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <time.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp
-index 9f741e3..dcc7ec9 100644
---- a/plugins/mp4/mp4.cpp
-+++ b/plugins/mp4/mp4.cpp
-@@ -27,7 +27,8 @@
- 
- #include <string.h>
- #include <stdio.h>
--#include <mp4.h>
-+#include <stdlib.h>
-+#include <mp4v2/mp4v2.h>
- #include "metadata.h"
- #include "plugin.h"
- #ifndef WIN32
-diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp
-index 3d7a50a..a28901c 100644
---- a/plugins/wma/wma.cpp
-+++ b/plugins/wma/wma.cpp
-@@ -27,6 +27,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <wmafile.h>
- #include "metadata.h"
- #include "plugin.h"
-diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp
-index 1b38af8..31fa150 100644
---- a/plugins/wma/wmafile.cpp
-+++ b/plugins/wma/wmafile.cpp
-@@ -19,6 +19,7 @@
-  *   USA                                                                   *
-  ***************************************************************************/
- 
-+#include <string.h>
- #include <tstring.h>
- #include <wmafile.h>
- #include <wmatag.h>
+diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h
+*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2006-11-18 05:52:08.000000000 -0500
+--- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 29,34 ****
+--- 29,35 ----
+  
+  #include <string>
+  #include <cstdio>
++ #include <cstring>
+  
+  #include "defs.h"
+  #include "tp_c.h"
+diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp
+*** libtunepimp-0.5.3/lib/c_wrapper.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/c_wrapper.cpp	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 43,48 ****
+--- 43,49 ----
+                           if (obj == NULL) return;
+  
+  #include <deque>
++ #include <cstdlib>
+  
+  class NotifyData
+  {
+diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp
+*** libtunepimp-0.5.3/lib/fileio.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/fileio.cpp	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 27,32 ****
+--- 27,34 ----
+  
+  #include <assert.h>
+  #include <errno.h>
++ #include <string.h>
++ #include <stdlib.h>
+  #include <string>
+  #ifndef WIN32
+  #include <unistd.h>
+***************
+*** 122,128 ****
+  
+  void tmktempname(const char *path, char *newPath, int newPathLen)
+  {
+!     char *ptr, *temp;
+  
+      temp = (char *)malloc(strlen(path) + 32);
+      ptr = strrchr(path, dirSepChar);
+--- 124,131 ----
+  
+  void tmktempname(const char *path, char *newPath, int newPathLen)
+  {
+!     char *temp;
+! 	const char *ptr;
+  
+      temp = (char *)malloc(strlen(path) + 32);
+      ptr = strrchr(path, dirSepChar);
+diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp
+*** libtunepimp-0.5.3/lib/metadata.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/metadata.cpp	2011-11-06 09:00:14.817684754 -0500
+***************
+*** 24,31 ****
+     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
+  
+  ----------------------------------------------------------------------------*/
+! #include <math.h>
+! #include <stdio.h>
+  #include "metadata.h"
+  #include "../config.h"
+  using namespace std;
+--- 24,32 ----
+     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
+  
+  ----------------------------------------------------------------------------*/
+! #include <cmath>
+! #include <cstdio>
+! #include <cstdlib>
+  #include "metadata.h"
+  #include "../config.h"
+  using namespace std;
+diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp
+*** libtunepimp-0.5.3/lib/protocol.cpp	2006-11-28 15:25:04.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/protocol.cpp	2011-11-06 09:00:23.281742454 -0500
+***************
+*** 8,18 ****
+  -------------------------------------------------------------------*/
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string>
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+- #include <curl/types.h>
+  #include <curl/easy.h>
+  using namespace std;
+  
+--- 8,18 ----
+  -------------------------------------------------------------------*/
+  #include <stdio.h>
+  #include <stdlib.h>
++ #include <string.h>
+  #include <string>
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+  #include <curl/easy.h>
+  using namespace std;
+  
+diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp
+*** libtunepimp-0.5.3/lib/readmeta.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/readmeta.cpp	2011-11-06 09:00:14.817684754 -0500
+***************
+*** 30,36 ****
+  #endif
+  #endif
+  
+! #include <stdio.h>
+  #ifndef WIN32
+  #include <unistd.h>
+  #endif
+--- 30,37 ----
+  #endif
+  #endif
+  
+! #include <cstdio>
+! #include <cstdlib>
+  #ifndef WIN32
+  #include <unistd.h>
+  #endif
+diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp
+*** libtunepimp-0.5.3/lib/tunepimp.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/tunepimp.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 30,36 ****
+  #endif
+  #endif
+  
+! #include <stdio.h>
+  #include <map>
+  using namespace std;
+  
+--- 30,37 ----
+  #endif
+  #endif
+  
+! #include <cstdio>
+! #include <cstdlib>
+  #include <map>
+  using namespace std;
+  
+diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp
+*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2006-11-18 05:52:26.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include "utf8util.h"
+  #include "utf8.h"
+  #ifdef WIN32
+diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp
+*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <assert.h>
+  #include <ctype.h>
+  #include <musicbrainz/mb_c.h>
+diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp
+*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <time.h>
+  #include <ctype.h>
+  #include <musicbrainz/mb_c.h>
+diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp
+*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2006-11-18 05:51:08.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 27,33 ****
+  
+  #include <string.h>
+  #include <stdio.h>
+! #include <mp4.h>
+  #include "metadata.h"
+  #include "plugin.h"
+  #ifndef WIN32
+--- 27,34 ----
+  
+  #include <string.h>
+  #include <stdio.h>
+! #include <stdlib.h>
+! #include <mp4v2/mp4v2.h>
+  #include "metadata.h"
+  #include "plugin.h"
+  #ifndef WIN32
+diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp
+*** libtunepimp-0.5.3/plugins/wma/wma.cpp	2006-11-18 05:51:28.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/wma/wma.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 27,32 ****
+--- 27,33 ----
+  
+  #include <string.h>
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <wmafile.h>
+  #include "metadata.h"
+  #include "plugin.h"
+diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp
+*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2006-11-18 05:51:28.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 19,24 ****
+--- 19,25 ----
+   *   USA                                                                   *
+   ***************************************************************************/
+  
++ #include <string.h>
+  #include <tstring.h>
+  #include <wmafile.h>
+  #include <wmatag.h>