public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/trunk/; revision=30261
This commit is contained in:
Rob Vermaas 2011-11-06 14:26:55 +00:00
parent 1b9adf9951
commit 25d6f604bb
3 changed files with 251 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libofa/curl-types.patch Normal file
View File

@ -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 ----

2
pkgs/development/libraries/libofa/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ expat curl fftw ]; 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 { src = fetchurl {
url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz"; url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";

226
pkgs/development/libraries/libtunepimp/gcc-4.x.patch
View File

@ -1,8 +1,9 @@
diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h
index f9bab5d..ea08cf5 100644 *** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2006-11-18 05:52:08.000000000 -0500
--- a/include/tunepimp-0.5/metadata.h --- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h 2011-11-06 09:00:14.816684749 -0500
+++ b/include/tunepimp-0.5/metadata.h ***************
@@ -29,6 +29,7 @@ *** 29,34 ****
--- 29,35 ----
#include <string> #include <string>
#include <cstdio> #include <cstdio>
@ -10,11 +11,12 @@ index f9bab5d..ea08cf5 100644
#include "defs.h" #include "defs.h"
#include "tp_c.h" #include "tp_c.h"
diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp
index 760cc08..66c6111 100644 *** libtunepimp-0.5.3/lib/c_wrapper.cpp 2006-11-18 05:52:33.000000000 -0500
--- a/lib/c_wrapper.cpp --- libtunepimp-0.5.3-new/lib/c_wrapper.cpp 2011-11-06 09:00:14.816684749 -0500
+++ b/lib/c_wrapper.cpp ***************
@@ -43,6 +43,7 @@ *** 43,48 ****
--- 43,49 ----
if (obj == NULL) return; if (obj == NULL) return;
#include <deque> #include <deque>
@ -22,11 +24,12 @@ index 760cc08..66c6111 100644
class NotifyData class NotifyData
{ {
diff --git a/lib/fileio.cpp b/lib/fileio.cpp diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp
index a1602da..abe2b24 100644 *** libtunepimp-0.5.3/lib/fileio.cpp 2006-11-18 05:52:33.000000000 -0500
--- a/lib/fileio.cpp --- libtunepimp-0.5.3-new/lib/fileio.cpp 2011-11-06 09:00:14.816684749 -0500
+++ b/lib/fileio.cpp ***************
@@ -27,6 +27,8 @@ *** 27,32 ****
--- 27,34 ----
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
@ -35,37 +38,64 @@ index a1602da..abe2b24 100644
#include <string> #include <string>
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>
@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding) ***************
*** 122,128 ****
void tmktempname(const char *path, char *newPath, int newPathLen) void tmktempname(const char *path, char *newPath, int newPathLen)
{ {
- char *ptr, *temp; ! char *ptr, *temp;
+ char *temp;
+ const char *ptr;
temp = (char *)malloc(strlen(path) + 32); temp = (char *)malloc(strlen(path) + 32);
ptr = strrchr(path, dirSepChar); ptr = strrchr(path, dirSepChar);
diff --git a/lib/metadata.cpp b/lib/metadata.cpp --- 124,131 ----
index 0a1a70a..dcd0aa1 100644
--- a/lib/metadata.cpp void tmktempname(const char *path, char *newPath, int newPathLen)
+++ b/lib/metadata.cpp {
@@ -24,8 +24,9 @@ ! 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 $ $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
-#include <math.h> ! #include <math.h>
-#include <stdio.h> ! #include <stdio.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
#include "metadata.h" #include "metadata.h"
#include "../config.h" #include "../config.h"
using namespace std; using namespace std;
diff --git a/lib/protocol.cpp b/lib/protocol.cpp --- 24,32 ----
index 83e8b33..3436f80 100644 $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
--- a/lib/protocol.cpp
+++ b/lib/protocol.cpp ----------------------------------------------------------------------------*/
@@ -8,6 +8,7 @@ ! #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 <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -73,39 +103,58 @@ index 83e8b33..3436f80 100644
#include <string> #include <string>
#include <map> #include <map>
#include <expat.h> #include <expat.h>
diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp #include <curl/curl.h>
index 7f325de..5e5513a 100644 #include <curl/easy.h>
--- a/lib/readmeta.cpp using namespace std;
+++ b/lib/readmeta.cpp
@@ -30,7 +30,8 @@ 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
#endif #endif
-#include <stdio.h> ! #include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>
#endif #endif
diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp --- 30,37 ----
index bf09383..f1b9b56 100644
--- a/lib/tunepimp.cpp
+++ b/lib/tunepimp.cpp
@@ -30,7 +30,8 @@
#endif #endif
#endif #endif
-#include <stdio.h> ! #include <cstdio>
+#include <cstdio> ! #include <cstdlib>
+#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> #include <map>
using namespace std; using namespace std;
diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp --- 30,37 ----
index a066956..6ea86e4 100644 #endif
--- a/lib/utf8/utf8util.cpp #endif
+++ b/lib/utf8/utf8util.cpp
@@ -26,6 +26,7 @@ ! #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 <stdio.h>
@ -113,11 +162,12 @@ index a066956..6ea86e4 100644
#include "utf8util.h" #include "utf8util.h"
#include "utf8.h" #include "utf8.h"
#ifdef WIN32 #ifdef WIN32
diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp 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
index fa9a7e0..efac1c9 100644 *** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2006-11-18 05:51:07.000000000 -0500
--- a/plugins/mp3/id3_2_3_meta.cpp --- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp 2011-11-06 09:00:14.818684760 -0500
+++ b/plugins/mp3/id3_2_3_meta.cpp ***************
@@ -26,6 +26,7 @@ *** 26,31 ****
--- 26,32 ----
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
#include <stdio.h> #include <stdio.h>
@ -125,11 +175,12 @@ index fa9a7e0..efac1c9 100644
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <musicbrainz/mb_c.h> #include <musicbrainz/mb_c.h>
diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp
index d860bf6..804ca5c 100644 *** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2006-11-18 05:51:07.000000000 -0500
--- a/plugins/mp3/id3_meta.cpp --- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp 2011-11-06 09:00:14.818684760 -0500
+++ b/plugins/mp3/id3_meta.cpp ***************
@@ -26,6 +26,7 @@ *** 26,31 ****
--- 26,32 ----
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
#include <stdio.h> #include <stdio.h>
@ -137,25 +188,33 @@ index d860bf6..804ca5c 100644
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <musicbrainz/mb_c.h> #include <musicbrainz/mb_c.h>
diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp
index 9f741e3..dcc7ec9 100644 *** libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2006-11-18 05:51:08.000000000 -0500
--- a/plugins/mp4/mp4.cpp --- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp 2011-11-06 09:00:14.819684766 -0500
+++ b/plugins/mp4/mp4.cpp ***************
@@ -27,7 +27,8 @@ *** 27,33 ****
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
-#include <mp4.h> ! #include <mp4.h>
+#include <stdlib.h>
+#include <mp4v2/mp4v2.h>
#include "metadata.h" #include "metadata.h"
#include "plugin.h" #include "plugin.h"
#ifndef WIN32 #ifndef WIN32
diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp --- 27,34 ----
index 3d7a50a..a28901c 100644
--- a/plugins/wma/wma.cpp #include <string.h>
+++ b/plugins/wma/wma.cpp #include <stdio.h>
@@ -27,6 +27,7 @@ ! #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 <string.h>
#include <stdio.h> #include <stdio.h>
@ -163,11 +222,12 @@ index 3d7a50a..a28901c 100644
#include <wmafile.h> #include <wmafile.h>
#include "metadata.h" #include "metadata.h"
#include "plugin.h" #include "plugin.h"
diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp
index 1b38af8..31fa150 100644 *** libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2006-11-18 05:51:28.000000000 -0500
--- a/plugins/wma/wmafile.cpp --- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp 2011-11-06 09:00:14.819684766 -0500
+++ b/plugins/wma/wmafile.cpp ***************
@@ -19,6 +19,7 @@ *** 19,24 ****
--- 19,25 ----
* USA * * USA *
***************************************************************************/ ***************************************************************************/